diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5bf47183eab..1ce41419f55 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,1151 +1,1149 @@
 cmake_minimum_required(VERSION 2.8.12)
 
 project(calligra)
 
 message(STATUS "Using CMake version: ${CMAKE_VERSION}")
 
 if (POLICY CMP0002)
     cmake_policy(SET CMP0002 OLD)
 endif()
 if (POLICY CMP0017)
     cmake_policy(SET CMP0017 NEW)
 endif ()
 if (POLICY CMP0022)
     cmake_policy(SET CMP0022 OLD)
 endif ()
 if (POLICY CMP0026)
     cmake_policy(SET CMP0026 OLD)
 endif()
 if (POLICY CMP0046)
     cmake_policy(SET CMP0046 OLD)
 endif ()
 if (POLICY CMP0059)
     cmake_policy(SET CMP0059 OLD)
 endif()
 if (POLICY CMP0063)
     cmake_policy(SET CMP0063 NEW)
 endif()
 if (POLICY CMP0071)
     cmake_policy(SET CMP0071 NEW)
 endif()
 
 # ensure out-of-source build
 string(COMPARE EQUAL "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" isBuildInSource)
 if(isBuildInSource)
     message(FATAL_ERROR "Compiling Calligra inside the source folder is not possible.\nPlease refer to the build instruction: https://community.kde.org/Calligra/Building/3\nYou need to clean up the source folder from all build artifacts just created, otherwise further building attempts will fail again: With a git repo, you can use \"git clean -df\" in the toplevel source folder (attention! will remove also uncommited changes to the source code). With sources from a file bundle (like a zip file), delete the source folder and unbundle the sources again.")
 endif()
 
 ######################
 #######################
 ## Constants defines ##
 #######################
 ######################
 
 # define common versions of Calligra applications, used to generate calligraversion.h
 # update these version for every release:
 set(CALLIGRA_VERSION_STRING "3.1.90")
 set(CALLIGRA_STABLE_VERSION_MAJOR 3) # 3 for 3.x, 4 for 4.x, etc.
 set(CALLIGRA_STABLE_VERSION_MINOR 1) # 0 for 3.0, 1 for 3.1, etc.
 set(CALLIGRA_VERSION_RELEASE 90)     # 89 for Alpha, increase for next test releases, set 0 for first Stable, etc.
 #set(CALLIGRA_ALPHA 1) # uncomment only for Alpha
 set(CALLIGRA_BETA 1) # uncomment only for Beta
 #set(CALLIGRA_RC 1) # uncomment only for RC
 set(CALLIGRA_YEAR 2020) # update every year
 
 if(NOT DEFINED CALLIGRA_ALPHA AND NOT DEFINED CALLIGRA_BETA AND NOT DEFINED CALLIGRA_RC)
     set(CALLIGRA_STABLE 1) # do not edit
 endif()
 
 message(STATUS "Calligra version: ${CALLIGRA_VERSION_STRING}")
 
 # Define the generic version of the Calligra libraries here
 # This makes it easy to advance it when the next Calligra release comes.
 # 14 was the last GENERIC_CALLIGRA_LIB_VERSION_MAJOR of the previous Calligra series
 # (2.x) so we're starting with 15 in 3.x series.
 if(CALLIGRA_STABLE_VERSION_MAJOR EQUAL 3)
     math(EXPR GENERIC_CALLIGRA_LIB_VERSION_MAJOR "${CALLIGRA_STABLE_VERSION_MINOR} + 15")
 else()
     # let's make sure we won't forget to update the "15"
     message(FATAL_ERROR "Reminder: please update offset == 15 used to compute GENERIC_CALLIGRA_LIB_VERSION_MAJOR to something bigger")
 endif()
 set(GENERIC_CALLIGRA_LIB_VERSION "${GENERIC_CALLIGRA_LIB_VERSION_MAJOR}.0.0")
 set(GENERIC_CALLIGRA_LIB_SOVERSION "${GENERIC_CALLIGRA_LIB_VERSION_MAJOR}")
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
     "${CMAKE_SOURCE_DIR}/cmake/modules")
 
 message("Module path:" ${CMAKE_MODULE_PATH})
 
 # fetch git revision for the current build
 
 set(CALLIGRA_GIT_SHA1_STRING "")
 set(CALLIGRA_GIT_BRANCH_STRING "")
 
 include(GetGitRevisionDescription)
 get_git_head_revision(GIT_REFSPEC GIT_SHA1)
 get_git_branch(GIT_BRANCH)
 
 if(GIT_SHA1 AND GIT_BRANCH)
     string(SUBSTRING ${GIT_SHA1} 0 7 GIT_SHA1)
     set(CALLIGRA_GIT_SHA1_STRING ${GIT_SHA1})
     set(CALLIGRA_GIT_BRANCH_STRING ${GIT_BRANCH})
 endif()
 
 if(NOT DEFINED RELEASE_BUILD)
     # estimate mode by CMAKE_BUILD_TYPE content if not set on cmdline
     string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_TOLOWER)
     set(RELEASE_BUILD_TYPES "release" "relwithdebinfo" "minsizerel")
     list(FIND RELEASE_BUILD_TYPES "${CMAKE_BUILD_TYPE_TOLOWER}" INDEX)
     if (INDEX EQUAL -1)
 	set(RELEASE_BUILD FALSE)
     else()
 	set(RELEASE_BUILD TRUE)
     endif()
 endif()
 message(STATUS "Release build: ${RELEASE_BUILD}")
 
 # use CPP-11
 if (CMAKE_VERSION VERSION_LESS "3.1")
     set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 else ()
     set (CMAKE_CXX_STANDARD 11)
 endif ()
 
 ############
 #############
 ## Options ##
 #############
 ############
 
 option(GHNS "support Get Hot New Stuff" OFF)
 option(PACKAGERS_BUILD "Build support of multiple CPU architectures in one binary. Should be used by packagers only." ON)
 
 #######################
 ########################
 ## Productset setting ##
 ########################
 #######################
 
 # For predefined productsets see the definitions in CalligraProducts.cmake and
 # in the files in the folder cmake/productsets.
 
 # Finding out the products & features to build is done in 5 steps:
 # 1. have the user define the products/features wanted, by giving a productset
 # 2. estimate all additional required products/features
 # 3. estimate which of the products/features can be build by external deps
 # 4. find which products/features have been temporarily disabled due to problems
 # 5. estimate which of the products/features can be build by internal deps
 
 # get the special macros
 include(CalligraProductSetMacros)
 
 # get the definitions of products, features and product sets
 include(CalligraProducts.cmake)
 
 set(PRODUCTSET_DEFAULT "ALL")
 
 if(NOT PRODUCTSET)
     set(PRODUCTSET ${PRODUCTSET_DEFAULT} CACHE STRING "Set of products/features to build" FORCE)
 endif()
 
 if (RELEASE_BUILD)
     set(CALLIGRA_SHOULD_BUILD_STAGING FALSE)
     if(BUILD_UNMAINTAINED)
 	set(CALLIGRA_SHOULD_BUILD_UNMAINTAINED TRUE)
     else()
 	set(CALLIGRA_SHOULD_BUILD_UNMAINTAINED FALSE)
     endif()
 else ()
     set(CALLIGRA_SHOULD_BUILD_STAGING TRUE)
     set(CALLIGRA_SHOULD_BUILD_UNMAINTAINED TRUE)
 endif ()
 
 # finally choose products/features to build
 calligra_set_productset(${PRODUCTSET})
 
 ##########################
 ###########################
 ## Look for ECM, Qt, KF5 ##
 ###########################
 ##########################
 
 find_package(ECM 5.19 REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
 
 # ECM KDE macros (include first, to have their policies and settings effect all other macros)
 include(KDEInstallDirs)
 include(KDECMakeSettings NO_POLICY_SCOPE)
 include(KDECompilerSettings NO_POLICY_SCOPE)
 # CMake macros
 include(CMakePackageConfigHelpers)
 include(WriteBasicConfigVersionFile)
 include(CheckFunctionExists)
 include(CheckTypeSize)
 include(CheckIncludeFile)
 include(GenerateExportHeader)
 include(FeatureSummary)
 # ECM macros
 include(ECMOptionalAddSubdirectory)
 include(ECMInstallIcons)
 include(ECMAddAppIcon)
 include(ECMSetupVersion)
 include(ECMAddTests)
 include(ECMMarkAsTest)
 include(ECMMarkNonGuiExecutable)
 include(ECMGenerateHeaders)
 # own macros
 include(MacroBoolTo01)
 include(MacroOptionalFindPackage)
 include(MacroEnsureVersion)
 include(MacroDesktopToJson)
 
 
 set(REQUIRED_KF5_VERSION "5.7.0")
 
 find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED
     COMPONENTS
     Archive
     Codecs
     Completion
     Config
     ConfigWidgets
     CoreAddons
     DBusAddons
     DocTools
     GuiAddons
     I18n
     IconThemes
     ItemViews
     JobWidgets
     KCMUtils
     KDELibs4Support
     KIO
     Kross
     Notifications
     NotifyConfig
     Parts
     Sonnet
     TextWidgets
     Wallet
     WidgetsAddons
     WindowSystem
     XmlGui
     )
 
 find_package(KF5Activities)
 find_package(KF5KHtml)
 
 set_package_properties(KF5Activities PROPERTIES
     TYPE OPTIONAL
     )
 set_package_properties(KF5KHtml PROPERTIES
     PURPOSE "Required for HTML2ODS import filter"
     TYPE OPTIONAL
     )
 
 if(KF5Activities_FOUND)
     set(HAVE_KACTIVITIES TRUE)
 endif()
 
 if(${KF5_VERSION} VERSION_LESS "5.16.0")
     set(CALLIGRA_OLD_PLUGIN_METADATA TRUE)
 endif()
 
 
 set(REQUIRED_QT_VERSION "5.3.0")
 
 find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED
     COMPONENTS
     Core
     Gui
     Network
     PrintSupport
     Svg
     Test
     Widgets
     Xml
     )
 find_package(Qt5 ${REQUIRED_QT_VERSION} QUIET
     COMPONENTS
     DBus
     OpenGL
     Quick
     QuickWidgets
     Sql
 )
 
 # Qt5Declarative was removed in Qt 5.6.0 so search for it in a separate call
 # Including it in a collected find_package(Qt5 ...) call can lead to a fatal not-found error:
 # * Qt5 (required version >= 5.3.0)
 find_package(Qt5Declarative ${REQUIRED_QT_VERSION} QUIET)
 
 set_package_properties(Qt5DBus PROPERTIES
     TYPE RECOMMENDED
     )
 set_package_properties(Qt5Declarative PROPERTIES
     PURPOSE "Required for QtQuick1 components"
     TYPE RECOMMENDED
     )
 set_package_properties(Qt5OpenGL PROPERTIES
     PURPOSE "Required for QtQuick1 components"
     TYPE RECOMMENDED
     )
 set_package_properties(Qt5Quick PROPERTIES
     PURPOSE "Required for QtQuick2 components"
     TYPE RECOMMENDED
     )
 set_package_properties(Qt5QuickWidgets PROPERTIES
     PURPOSE "Required for Calligra Gemini"
     TYPE RECOMMENDED
     )
 set_package_properties(Qt5Sql PROPERTIES
     PURPOSE "Optional for Sheets' database connection"
     TYPE OPTIONAL
     )
 set_package_properties(Qt5WebKit PROPERTIES
     PURPOSE "Required for Braindump's Web shape"
     TYPE OPTIONAL
     )
 
 set(HAVE_OPENGL ${Qt5OpenGL_FOUND})
 
 
 if (GHNS)
     find_package(Attica 3.0)
     find_package(NewStuff)
     set_package_properties(Attica PROPERTIES
 	DESCRIPTION "Attica is used for Get Hot New Stuff."
 	URL "https://commits.kde.org/attica"
 	TYPE OPTIONAL
 	)
 
     if (NOT LIBATTICA_FOUND)
 	set(GHNS FALSE)
     else ()
 	message(STATUS "WARNING: You are compiling with Get Hot New Stuff enabled. Do not do that when building distribution packages. GHNS is unusable these days until someone starts maintaining it again.")
     endif ()
 endif ()
 
 find_package(X11)
 if(X11_FOUND)
     find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED
 	COMPONENTS
 	X11Extras
 	)
     set(HAVE_X11 TRUE)
     add_definitions(-DHAVE_X11)
 else()
     set(HAVE_X11 FALSE)
 endif()
 
 # use sane compile flags
 add_definitions(
     -DQT_USE_QSTRINGBUILDER
     -DQT_STRICT_ITERATORS
     -DQT_NO_SIGNALS_SLOTS_KEYWORDS
     -DQT_NO_URL_CAST_FROM_STRING
     -DQT_NO_CAST_TO_ASCII
     )
 
 # only with this definition will all the FOO_TEST_EXPORT macro do something
 # TODO: check if this can be moved to only those places which make use of it,
 # to reduce global compiler definitions that would trigger a recompile of
 # everything on a change (like adding/removing tests to/from the build)
 if(BUILD_TESTING)
     add_definitions(-DCOMPILING_TESTS)
 endif()
 
 # overcome some platform incompatibilities
 if(WIN32)
     if(NOT MINGW)
 	include_directories(${CMAKE_CURRENT_SOURCE_DIR}/winquirks)
 	add_definitions(-D_USE_MATH_DEFINES)
 	add_definitions(-DNOMINMAX)
     endif()
     set(WIN32_PLATFORM_NET_LIBS ws2_32.lib netapi32.lib)
 endif()
 
 ###########################
 ############################
 ## Required dependencies  ##
 ############################
 ###########################
 
 find_package(Perl REQUIRED)
 find_package(ZLIB REQUIRED)
 
 add_definitions(-DBOOST_ALL_NO_LIB)
 find_package(Boost REQUIRED COMPONENTS system) # for pigment and stage
 if (NOT Boost_FOUND)
     message(FATAL_ERROR "Did not find Boost. Boost is required for the core libraries, stage, sheets.")
 endif ()
 
 ###########################
 ############################
 ## Optional dependencies  ##
 ############################
 ###########################
 
 
 ##
 ## Check for OpenEXR
 ##
 
 macro_optional_find_package(OpenEXR)
 macro_bool_to_01(OPENEXR_FOUND HAVE_OPENEXR)
 
 ##
 ## Test for GNU Scientific Library
 ##
 macro_optional_find_package(GSL 1.7)
 set_package_properties(GSL_FOUND PROPERTIES
     DESCRIPTION "GNU Scientific Library"
     URL "https://www.gnu.org/software/gsl"
     PURPOSE "Required by Sheets' solver plugin"
     TYPE OPTIONAL
     )
 macro_bool_to_01(GSL_FOUND HAVE_GSL)
 configure_file(config-gsl.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-gsl.h )
 
 ##
 ## Test for Phonon4Qt5
 ##
 find_package(Phonon4Qt5 QUIET)
 set_package_properties(Phonon4Qt5 PROPERTIES
     DESCRIPTION "Abstraction lib for multimedia applications"
     URL "https://www.kde.org/"
     PURPOSE "Required by Stage event actions and Videoshape plugin"
     TYPE OPTIONAL
     )
 
 ##
 ## Test for KF5CalendarCore
 ##
 find_package(KF5CalendarCore CONFIG QUIET)
 set_package_properties(KF5CalendarCore PROPERTIES
     DESCRIPTION "KDE Calendar Library"
     URL "https://www.kde.org/"
     PURPOSE "Optionally used by semantic item Event"
     TYPE OPTIONAL
     )
 
 ##
 ## Test for KF5Contacts
 ##
 find_package(KF5Contacts CONFIG QUIET)
 set_package_properties(KF5Contacts PROPERTIES
     DESCRIPTION "KDE Address book Library"
     URL "https://www.kde.org/"
     PURPOSE "Optionally used by semantic item Contact"
     TYPE OPTIONAL
     )
 
 ##
 ## Test for KF5AkonadiCore
 ##
 find_package(KF5Akonadi CONFIG QUIET)
 set_package_properties(KF5Akonadi PROPERTIES
     DESCRIPTION "Library for general Access to Akonadi"
     URL "https://www.kde.org/"
     PURPOSE "Optionally used by semantic items Event and Contact"
     TYPE OPTIONAL
     )
 
 ##
 ## Test for KChart
 ##
 macro_optional_find_package(KChart 2.6.0 QUIET)
 set_package_properties(KChart PROPERTIES
     DESCRIPTION "Library for creating business charts (part of KDiagram)"
     URL "https://www.kde.org/"
     PURPOSE "Required by Chart shape"
     TYPE RECOMMENDED
     )
 
 ##
 ## Test for eigen3
 ##
 macro_optional_find_package(Eigen3)
 set_package_properties(Eigen3 PROPERTIES
     DESCRIPTION "C++ template library for linear algebra"
     URL "http://eigen.tuxfamily.org"
     PURPOSE "Required by Calligra Sheets"
     TYPE RECOMMENDED
     )
 
 ##
 ## Test for QCA2
 ##
 macro_optional_find_package(Qca-qt5 2.1.0 QUIET)
 set_package_properties(Qca-qt5 PROPERTIES
     DESCRIPTION "Qt Cryptographic Architecture"
     URL "http:/download.kde.org/stable/qca-qt5"
     PURPOSE "Required for encrypted OpenDocument files and encrypted xls files support (available as a module in kdesupport)"
     TYPE OPTIONAL
     )
 
 ##
 ## Test for soprano
 ##
 # QT5TODO: push for released (and maintained) Qt5 version of Soprano, T462, T461
 # macro_optional_find_package(Soprano)
 set(Soprano_FOUND FALSE)
 set_package_properties(Soprano PROPERTIES
     DESCRIPTION "RDF handling library"
     URL "http://soprano.sourceforge.net/"
     PURPOSE "Required to handle RDF metadata in ODF"
     TYPE OPTIONAL
     )
 if(NOT Soprano_FOUND)
     set(SOPRANO_INCLUDE_DIR "")
 endif()
 
 ##
 ## Test for marble
 ##
 # Temporary fix to avoid looking for Marble unneccessary
 # Its only used in RDF so until soprano is ported there is no use for Marble
 if (Soprano_FOUND)
     macro_optional_find_package(Marble CONFIG)
     set(Marble_FOUND FALSE)
     set_package_properties(Marble PROPERTIES
         DESCRIPTION "World Globe Widget library"
         URL "https://marble.kde.org/"
         PURPOSE "Required by RDF to show locations on a map"
         TYPE OPTIONAL
     )
 else()
     message(STATUS "Soprano not found. Skipped looking for Marble.")
 endif()
 
 ##
 ## Test for lcms
 ##
 macro_optional_find_package(LCMS2)
 set_package_properties(LCMS2 PROPERTIES
     DESCRIPTION "LittleCMS, a color management engine"
     URL "http://www.littlecms.com"
     PURPOSE "Will be used for color management"
     TYPE OPTIONAL
     )
 if(LCMS2_FOUND)
     if(NOT ${LCMS2_VERSION} VERSION_LESS 2040 )
 	set(HAVE_LCMS24 TRUE)
     endif()
     set(HAVE_REQUIRED_LCMS_VERSION TRUE)
     set(HAVE_LCMS2 TRUE)
 endif()
 
 ##
 ## Test for Vc
 ##
 
 set(HAVE_VC FALSE)
 if (BUILD_VC)
     # NOTE: This tampers with cmake variables (at least cmake_minimum_required), so may give build problems
     set(OLD_CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} )
     set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules )
     if( NOT MSVC)
 	macro_optional_find_package(Vc 1.1.0)
 	set_package_properties(Vc PROPERTIES
 	    DESCRIPTION "Portable, zero-overhead SIMD library for C++"
 	    URL "https://github.com/VcDevel/Vc"
 	    PURPOSE "Required by the pigment for vectorization"
 	    TYPE OPTIONAL
 	    )
 	macro_bool_to_01(Vc_FOUND HAVE_VC)
 	macro_bool_to_01(PACKAGERS_BUILD DO_PACKAGERS_BUILD)
     endif()
     configure_file(config-vc.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-vc.h )
 
     if(HAVE_VC)
 	message(STATUS "Vc found!")
 	set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
 	    "${CMAKE_SOURCE_DIR}/cmake/vc")
 
 	include (VcMacros)
 
 	if(Vc_COMPILER_IS_CLANG)
 	    set(ADDITIONAL_VC_FLAGS "-Wabi -ffp-contract=fast -fPIC")
 	elseif (NOT MSVC)
 	    set(ADDITIONAL_VC_FLAGS "-Wabi -fabi-version=0 -ffp-contract=fast -fPIC")
 	endif()
 
 	#Handle Vc master
 	if(Vc_COMPILER_IS_GCC OR Vc_COMPILER_IS_CLANG)
 	    AddCompilerFlag("-std=c++11" _ok)
 	    if(NOT _ok)
 		AddCompilerFlag("-std=c++0x" _ok)
 	    endif()
 	endif()
 
 	macro(ko_compile_for_all_implementations_no_scalar _objs _src)
 	    if(PACKAGERS_BUILD)
 		vc_compile_for_all_implementations(${_objs} ${_src} FLAGS ${ADDITIONAL_VC_FLAGS} ONLY SSE2 SSSE3 SSE4_1 AVX AVX2+FMA+BMI2)
 	    else()
 		set(${_objs} ${_src})
 	    endif()
 	endmacro()
 
 	macro(ko_compile_for_all_implementations _objs _src)
 	    if(PACKAGERS_BUILD)
 		vc_compile_for_all_implementations(${_objs} ${_src} FLAGS ${ADDITIONAL_VC_FLAGS} ONLY Scalar SSE2 SSSE3 SSE4_1 AVX AVX2+FMA+BMI2)
 	    else()
 		set(${_objs} ${_src})
 	    endif()
 	endmacro()
 
 	if (NOT PACKAGERS_BUILD)
 	    # Optimize the whole Calligra for current architecture
 	    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Vc_DEFINITIONS}")
 	endif ()
     endif()
     set(CMAKE_MODULE_PATH ${OLD_CMAKE_MODULE_PATH} )
 
 else(BUILD_VC)
     configure_file(config-vc.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-vc.h )
 endif(BUILD_VC)
 
 if(WIN32)
     set(LIB_INSTALL_DIR ${LIB_INSTALL_DIR}
 	RUNTIME DESTINATION ${BIN_INSTALL_DIR}
 	LIBRARY ${INSTALL_TARGETS_DEFAULT_ARGS}
 	ARCHIVE ${INSTALL_TARGETS_DEFAULT_ARGS} )
 endif()
 
 ##
 ## Test for Fontconfig
 ##
 ## Only test if on non-Windows system
 if(NOT WIN32 AND NOT APPLE)
     macro_optional_find_package(Fontconfig)
     set_package_properties(Fontconfig PROPERTIES
 	DESCRIPTION "Library for configuring and customizing font access"
 	URL "http://fontconfig.org"
 	PURPOSE "Required to handle exact font size"
 	TYPE RECOMMENDED
 	)
 endif()
 
 ##
 ## Test for Freetype
 ##
 ## Only test if on non-Windows system
 if(NOT WIN32 AND NOT APPLE)
     macro_optional_find_package(Freetype)
     set_package_properties(Freetype PROPERTIES
 	DESCRIPTION "A Free, High-Quality, and Portable Font Engine"
 	URL "http://www.freetype.org/"
 	PURPOSE "Required to handle exact font size"
 	TYPE RECOMMENDED
 	)
 endif()
 
 if(NOT FONTCONFIG_FOUND OR NOT FREETYPE_FOUND)
     set(FONTCONFIG_INCLUDE_DIR "")
     set(FREETYPE_INCLUDE_DIRS "")
 else()
     add_definitions( -DSHOULD_BUILD_FONT_CONVERSION )
 endif()
 
 
 ##
 ## Test endianess
 ##
 include (TestBigEndian)
 test_big_endian(CMAKE_WORDS_BIGENDIAN)
 
 ##
 ## Test SharedMimeInfo
 ##
 macro_optional_find_package(SharedMimeInfo 1.3)
 set_package_properties(SharedMimeInfo PROPERTIES
     PURPOSE "Required to determine file types SVM or all of MSOOXML."
     TYPE RECOMMENDED
     )
 
 ##
 ## Test for Okular
 ##
 macro_optional_find_package(Okular5 0.99.60 QUIET)
 set_package_properties(Okular5 PROPERTIES
     DESCRIPTION "A unified document viewer"
     URL "https://okular.kde.org/"
     PURPOSE "Required to build the plugins for Okular"
     TYPE OPTIONAL
     )
 
 ##
 ## Test for librevenge
 ##
 macro_optional_find_package(LibRevenge)
 set_package_properties(LibRevenge PROPERTIES
     DESCRIPTION "A base library for writing document import filters"
     URL "http://sf.net/p/libwpd/librevenge/"
     PURPOSE "Required by various import filters"
     TYPE OPTIONAL
     )
 
 ##
 ## Test for libodfgen
 ##
 macro_optional_find_package(LibOdfGen)
 set_package_properties(LibOdfGen PROPERTIES
     DESCRIPTION "Open Document Format Generation Library"
     URL "http://sf.net/p/libwpd/libodfgen/"
     PURPOSE "Required by various import filters"
     TYPE OPTIONAL
     )
 
 ##
 ## Test for WordPerfect Document Library
 ##
 macro_optional_find_package(LibWpd)
 set_package_properties(LibWpd PROPERTIES
     DESCRIPTION "WordPerfect Document Library"
     URL "http://libwpd.sourceforge.net/"
     PURPOSE "Required by the Words WPD import filter"
     TYPE OPTIONAL
     )
 
 ##
 ## Test for WordPerfect Graphics Library
 ##
 macro_optional_find_package(LibWpg)
 set_package_properties(LibWpg PROPERTIES
     DESCRIPTION "WordPerfect Graphics Library"
     URL "http://libwpg.sourceforge.net/"
     PURPOSE "Required by the Karbon WPG import filter"
     TYPE OPTIONAL
     )
 
 ##
 ## Test for Microsoft Works Document Library
 ##
 macro_optional_find_package(LibWps)
 set_package_properties(LibWps PROPERTIES
     DESCRIPTION "Microsoft Works Document Library"
     URL "http://libwps.sourceforge.net/"
     PURPOSE "Required by the Words WPS import filter"
     TYPE OPTIONAL
     )
 
 ##
 ## Test for Microsoft Visio Document Library
 ##
 macro_optional_find_package(LibVisio)
 set_package_properties(LibVisio PROPERTIES
     DESCRIPTION "Visio Import Filter Library"
     URL "https://wiki.documentfoundation.org/DLP/Libraries/libvisio"
     PURPOSE "Required by the visio import filter"
     TYPE OPTIONAL
     )
 
 ##
 ## Test for Apple Keynote Document Library
 ##
 macro_optional_find_package(LibEtonyek)
 set_package_properties(LibEtonyek PROPERTIES
     DESCRIPTION "Apple Keynote Document Library"
     URL "https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
     PURPOSE "Required by the Stage keynote import filter"
     TYPE OPTIONAL
     )
 
 ##
 ## Test for qt-poppler
 ##
 macro_optional_find_package(Poppler COMPONENTS Qt5)
 set_package_properties(Poppler PROPERTIES
     DESCRIPTION "A PDF rendering library"
     URL "http://poppler.freedesktop.org"
     PURPOSE "Required by the Karbon PDF import filter and CSTester PDF feature"
     TYPE OPTIONAL
     )
 
 ##
 ## Test for qt-poppler not-officially-supported XPDF Headers
 ## Installing these is off by default in poppler sources, so lets make
 ## sure they're really there before trying to build the pdf import
 ##
 macro_optional_find_package(PopplerXPDFHeaders)
 set_package_properties(PopplerXPDFHeaders PROPERTIES
     DESCRIPTION "XPDF headers in the Poppler Qt5 interface library"
     URL "http://poppler.freedesktop.org"
     PURPOSE "Required by the Karbon PDF import filter"
     TYPE OPTIONAL
     )
 
 
 ##
 ## Test for libgit2
 ##
 macro_optional_find_package(Libgit2)
 
 ##
 ## Generate a file for prefix information
 ##
 
 ###############################
 ################################
 ## Add Calligra helper macros ##
 ################################
 ###############################
 
 include(MacroCalligraAddBenchmark)
 
 ####################
 #####################
 ## Define includes ##
 #####################
 ####################
 
 # WARNING: make sure that QT_INCLUDES is the first directory to be added to include_directory before
 #          any other include directory
 
 # for config.h and <toplevel/foo.h> includes (if any?)
 include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/interfaces )
 
 
 set(KOVERSION_INCLUDES ${CMAKE_SOURCE_DIR}/libs/version 
     ${CMAKE_BINARY_DIR}/libs/version
     )
 
 include_directories(${KOVERSION_INCLUDES})
 
 # koplugin is at the bottom of the stack
 set(KOPLUGIN_INCLUDES ${CMAKE_SOURCE_DIR}/libs/plugin)
 
 set(KUNDO2_INCLUDES ${CMAKE_SOURCE_DIR}/libs/kundo2
     ${CMAKE_BINARY_DIR}/libs/kundo2)
 
 # koodf is at the bottom of the stack
 set(KOODF_INCLUDES ${CMAKE_SOURCE_DIR}/libs/odf
     ${CMAKE_SOURCE_DIR}/libs/store
     ${CMAKE_BINARY_DIR}/libs/odf
     ${CMAKE_BINARY_DIR}/libs/store
     ${KOVERSION_INCLUDES}
     )
 
 # pigment depends on koplugin and lcms
 set(PIGMENT_INCLUDES ${KOPLUGIN_INCLUDES}
     ${KOVERSION_INCLUDES}
     ${CMAKE_SOURCE_DIR}/libs/pigment
     ${CMAKE_BINARY_DIR}/libs/pigment
     ${CMAKE_SOURCE_DIR}/libs/pigment/compositeops
     ${CMAKE_SOURCE_DIR}/libs/pigment/resources
     ${Boost_INCLUDE_DIRS}
 
     )
 
 # flake depends on koodf and pigment
 set(FLAKE_INCLUDES ${CMAKE_SOURCE_DIR}/libs/flake
     ${KOODF_INCLUDES}
     ${PIGMENT_INCLUDES}
     ${KUNDO2_INCLUDES}
     ${CMAKE_SOURCE_DIR}/libs/widgetutils
     ${CMAKE_SOURCE_DIR}/libs/flake/commands
     ${CMAKE_SOURCE_DIR}/libs/flake/tools
     ${CMAKE_SOURCE_DIR}/libs/flake/svg
     ${CMAKE_BINARY_DIR}/libs/flake)
 
 # vectorimage
 set(VECTORIMAGE_INCLUDES
     ${CMAKE_SOURCE_DIR}/libs/vectorimage
     ${CMAKE_SOURCE_DIR}/libs/vectorimage/libemf
     ${CMAKE_SOURCE_DIR}/libs/vectorimage/libsvm
     ${CMAKE_SOURCE_DIR}/libs/vectorimage/libwmf)
 
 # KoText depends on koplugin, odf
 set(KOTEXT_INCLUDES
     ${CMAKE_SOURCE_DIR}/libs/text
     ${CMAKE_BINARY_DIR}/libs/text
     ${CMAKE_SOURCE_DIR}/libs/text/changetracker
     ${CMAKE_SOURCE_DIR}/libs/text/styles
     ${CMAKE_SOURCE_DIR}/libs/text/opendocument
     ${SOPRANO_INCLUDE_DIR}
     ${FLAKE_INCLUDES}
     ${KOODF_INCLUDES})
 
 # TextLayout depends on kotext
 set(TEXTLAYOUT_INCLUDES ${KOTEXT_INCLUDES}
     ${CMAKE_SOURCE_DIR}/libs/textlayout
     ${CMAKE_BINARY_DIR}/libs/textlayout)
 
 # Widgets depends on kotext and flake
 set(KOWIDGETS_INCLUDES ${KOTEXT_INCLUDES}
     ${CMAKE_SOURCE_DIR}/libs/widgetutils
     ${CMAKE_BINARY_DIR}/libs/widgetutils
     ${CMAKE_SOURCE_DIR}/libs/widgets
     ${CMAKE_BINARY_DIR}/libs/widgets)
 
 # BasicFlakes depends on flake, widgets
 set(BASICFLAKES_INCLUDES ${KOWIDGETS_INCLUDES}
     ${CMAKE_SOURCE_DIR}/libs/basicflakes
     ${CMAKE_SOURCE_DIR}/libs/basicflakes/tools)
 
 
 # komain depends on kotext & flake
 set(KOMAIN_INCLUDES 
     ${KOWIDGETS_INCLUDES}
     ${TEXTLAYOUT_INCLUDES}
     ${CMAKE_SOURCE_DIR}/libs/main
     ${CMAKE_BINARY_DIR}/libs/main
     ${CMAKE_SOURCE_DIR}/libs/main/config)
 
 set(KORDF_INCLUDES ${KOMAIN_INCLUDES}
     ${CMAKE_SOURCE_DIR}/libs/rdf
     )
 set(KORDF_LIBS kordf)
 
 if(SHOULD_BUILD_FEATURE_SCRIPTING)
     set(KOKROSS_INCLUDES
 	${CMAKE_SOURCE_DIR}/libs/kross
 	${CMAKE_BINARY_DIR}/libs/kross)
 endif()
 
 # kopageapp
 set(KOPAGEAPP_INCLUDES ${TEXTLAYOUT_INCLUDES}
     ${PIGMENT_INCLUDES}
     ${KOMAIN_INCLUDES}
     ${CMAKE_SOURCE_DIR}/libs/widgets
     ${CMAKE_SOURCE_DIR}/libs/pageapp
     ${CMAKE_SOURCE_DIR}/libs/pageapp/commands
     ${CMAKE_BINARY_DIR}/libs/pageapp )
 
 #############################################
 ####           filter libraries          ####
 #############################################
 
 # libodf2
 set(KOODF2_INCLUDES
     ${CMAKE_SOURCE_DIR}/filters/libodf2
     ${CMAKE_SOURCE_DIR}/filters/libodf2/chart
     )
 
 # libodfreader
 set(KOODFREADER_INCLUDES
     ${CMAKE_SOURCE_DIR}/filters/libodfreader
     )
 
 ###################################################
 ####################################################
 ## Detect which products/features can be compiled ##
 ####################################################
 ###################################################
 
 if (NOT WIN32)
     set(NOT_WIN TRUE)
 endif()
 if (NOT QT_MAC_USE_COCOA)
     set(NOT_COCOA TRUE)
 endif()
 if (KReport_FOUND AND KREPORT_SCRIPTING)
     set(KReport_WithScripting_FOUND TRUE)
 endif()
 
 calligra_drop_product_on_bad_condition( FEATURE_RDF
     Soprano_FOUND "Soprano not found"
     )
 
 calligra_drop_product_on_bad_condition( PART_SHEETS
     EIGEN3_FOUND "Eigen devel not found"
     )
 
 calligra_drop_product_on_bad_condition( OKULAR_GENERATOR_ODP
     Okular5_FOUND "Okular devel not found"
     )
 
 calligra_drop_product_on_bad_condition( OKULAR_GENERATOR_ODT
     Okular5_FOUND "Okular devel not found"
     )
 
 calligra_drop_product_on_bad_condition( PLUGIN_CHARTSHAPE
     KChart_FOUND "KChart devel not found"
     )
 
 calligra_drop_product_on_bad_condition( PLUGIN_VIDEOSHAPE
     Phonon4Qt5_FOUND "Phonon4Qt5 devel not found"
     )
 
 calligra_drop_product_on_bad_condition( FILTER_KEY_TO_ODP
     LIBODFGEN_FOUND "libodfgen devel not found"
     LIBETONYEK_FOUND "libetonyek devel not found"
     LIBREVENGE_FOUND "librevenge devel not found"
     )
 
 calligra_drop_product_on_bad_condition( FILTER_VISIO_TO_ODG
     LIBODFGEN_FOUND "libodfgen devel not found"
     LIBVISIO_FOUND "libvisio devel not found"
     LIBREVENGE_FOUND "librevenge devel not found"
     )
 
 calligra_drop_product_on_bad_condition( FILTER_WORDPERFECT_TO_ODT
     LIBODFGEN_FOUND "libodfgen devel not found"
     LIBWPD_FOUND "libwpd devel not found"
     LIBWPG_FOUND "libwpg devel not found"
     LIBREVENGE_FOUND "librevenge devel not found"
     )
 
 calligra_drop_product_on_bad_condition( FILTER_WORKS_TO_ODT
     LIBODFGEN_FOUND "libodfgen devel not found"
     LIBWPS_FOUND "libwps devel not found"
     LIBREVENGE_FOUND "librevenge devel not found"
     )
 
 calligra_drop_product_on_bad_condition( FILTER_WPG_TO_SVG
     LIBWPG_FOUND "libwpg devel not found"
     LIBREVENGE_FOUND "librevenge devel not found"
     )
 
 calligra_drop_product_on_bad_condition( FILTER_WPG_TO_ODG
     LIBODFGEN_FOUND "libodfgen devel not found"
     LIBWPG_FOUND "libwpg devel not found"
     LIBREVENGE_FOUND "librevenge devel not found"
     )
 
 calligra_drop_product_on_bad_condition( FILTER_PDF_TO_SVG
     NOT_WIN "not supported on Windows"
     PopplerXPDFHeaders_FOUND "poppler xpdf headers not found"
     )
 
 calligra_drop_product_on_bad_condition( FILTER_HTML_TO_ODS
     NOT_WIN "not supported on Windows"
     NOT_COCOA "not supported with Qt Cocoa"
     KF5KHtml_FOUND "KF5KHtml devel not found"
     )
 
 calligra_drop_product_on_bad_condition( FILTER_SHEETS_TO_HTML
     NOT_WIN "not supported on Windows"
     NOT_COCOA "not supported with Qt Cocoa"
     )
 
 calligra_drop_product_on_bad_condition( FILTER_KSPREAD_TO_LATEX
     NOT_WIN "not supported on Windows"
     NOT_COCOA "not supported with Qt Cocoa"
     )
 
 calligra_drop_product_on_bad_condition( APP_BRAINDUMP
     NOT_WIN "unmaintained on Windows"
     Qt5WebKitWidgets_FOUND "QWebPage needed for webpage plugin"
     )
 
 calligra_drop_product_on_bad_condition( PLUGIN_CALLIGRAGEMINI_GIT
     LIBGIT2_FOUND  "libgit2 devel not found"
     )
 
 calligra_drop_product_on_bad_condition( PART_QTQUICK
     Qt5OpenGL_FOUND "Qt OpenGL not found"
     Qt5Declarative_FOUND "QtDeclarative not found"
     )
 
 calligra_drop_product_on_bad_condition( PART_COMPONENTS
     Qt5Quick_FOUND "QtQuick not found"
     )
 
 calligra_drop_product_on_bad_condition( APP_SLIDECOMPARE
     Qt5OpenGL_FOUND "Qt OpenGL not found"
     )
 
 #############################################
 ####  Backward compatibility BUILD_x=off ####
 #############################################
 
 # workaround: disable directly all products which might be activated by internal
 # dependencies, but belong to scope of old flag
 calligra_drop_products_on_old_flag(braindump APP_BRAINDUMP)
 calligra_drop_products_on_old_flag(karbon APP_KARBON)
 calligra_drop_products_on_old_flag(sheets PART_SHEETS APP_SHEETS)
 calligra_drop_products_on_old_flag(stage  PART_STAGE APP_STAGE)
 calligra_drop_products_on_old_flag(words  PART_WORDS APP_WORDS)
 
 #############################################
 ####      Temporarily broken products    ####
 #############################################
 
 # If a product does not build due to some temporary brokeness disable it here,
 # by calling calligra_disable_product with the product id and the reason,
 # e.g.:
 # calligra_disable_product(APP_FOO "isn't buildable at the moment")
 
 calligra_disable_product(APP_BRAINDUMP "Disabled, will (probably) be removed from Calligra")
 
-calligra_disable_product(DOC "Not maintained")
-
 #############################################
 ####     Calculate buildable products    ####
 #############################################
 
 calligra_drop_unbuildable_products()
 
 
 #############################################
 ####     Setup product-depending vars    ####
 #############################################
 
 if(SHOULD_BUILD_FEATURE_RDF)
     add_definitions( -DSHOULD_BUILD_RDF )
 endif()
 
 ###################
 ####################
 ## Subdirectories ##
 ####################
 ###################
 
 add_subdirectory(words)
 
 add_subdirectory(stage)
 
 add_subdirectory(sheets)
 
 if(SHOULD_BUILD_APP_KARBON)
     add_subdirectory(karbon)
 endif()
 
 if(SHOULD_BUILD_APP_BRAINDUMP)
     add_subdirectory(braindump)
 endif()
 
 if(SHOULD_BUILD_DOC)
     add_subdirectory(doc)
 endif()
 
 if(SHOULD_BUILD_PART_QTQUICK)
     add_subdirectory(qtquick)
 endif()
 
 if(SHOULD_BUILD_PART_COMPONENTS)
     add_subdirectory(components)
 endif()
 
 if(SHOULD_BUILD_GEMINI)
     add_subdirectory(gemini)
 endif()
 
 # non-app directories are moved here because they can depend on SHOULD_BUILD_{appname} variables set above
 add_subdirectory(libs)
 add_subdirectory(interfaces)
 add_subdirectory(pics)
 add_subdirectory(plugins)
 add_subdirectory(servicetypes)
 add_subdirectory(devtools)
 add_subdirectory(extras)
 add_subdirectory(filters)
 add_subdirectory(data)
 
 feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
 
 calligra_product_deps_report("product_deps")
 calligra_log_should_build()
 
 add_custom_target(apidox doc/api/gendocs.pl WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
 
 configure_file(KoConfig.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/KoConfig.h )
 if (SHOULD_BUILD_DEVEL_HEADERS)
     install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/KoConfig.h DESTINATION ${INCLUDE_INSTALL_DIR}/calligra COMPONENT Devel)
 endif()
 
 if (BUILD_TESTING)
     add_subdirectory(tests)
 endif(BUILD_TESTING)
diff --git a/CalligraProducts.cmake b/CalligraProducts.cmake
index 8020501fa61..ad82514348f 100644
--- a/CalligraProducts.cmake
+++ b/CalligraProducts.cmake
@@ -1,620 +1,620 @@
 ### DEFINITION OF PRODUCTS, FEATURES AND PRODUCTSETS
 ####################################################
 
 # When building Calligra a lot of different things are created and installed. To
 # describe them and their internal dependencies the concepts of "product",
 # "feature" and "product set" are used.
 
 # A "product" is the smallest functional unit which can be created in the build
 # and which is useful on its own when installed. Examples are e.g. libraries,
 # plugins or executables. Products have external and internal required
 # dependencies at build-time. Internal dependencies are noted in terms of other
 # products or features (see below) and could be e.g. other libraries to link
 # against or build tools needed to generate source files.
 # A product gets defined by setting an identifier, a descriptive fullname and
 # the needed internal build-time requirements. Any other product or feature
 # listed as requirement must have been defined before.
 
 # A "feature" is not a standalone product, but adds abilities to one or multiple
 # given products. One examples is e.g. scriptability. Features have external and
 # internal required dependencies at build-time. Internal dependencies are noted
 # in terms of other products or features and could be e.g. other libraries to
 # link against or build tools needed to generate source files.
 # A feature gets defined by setting an identifier, a descriptive fullname and
 # the needed internal build-time requirements. Any other product or feature
 # listed as requirement must have been defined before.
 
 # A "productset" is a selection of products and features which should be build
 # together. The products and features can be either essential or optional to the
 # set. If essential (REQUIRES), the whole productset will not be build if a
 # product or feature is missing another internal or external dependency. If
 # optional (OPTIONAL), the rest of the set will still be build in that case.
 # The products and features to include in a set can be listed directly or
 # indirectly: they can be named explicitly, but also by including other
 # productsets in a set, whose products and features will then be part of the
 # first set as well.
 # Products, features and productsets can be listed as dependencies in multiple
 # product sets. As with dependencies for products or features, they must have
 # been defined before.
 
 # Products, features and product sets are in the same namespace, so a given
 # identifier can be only used either for a product or for a feature or for a
 # product set.
 
 # The ids of products and features (but not sets) are used to generate cmake
 # variables SHOULD_BUILD_${ID}, which then are used to control what is build and
 # how.
 
 
 #############################################
 ####      Product definitions            ####
 #############################################
 
 # For defining new products see end of this file, "How to add another product?"
 
 # IDEA: also add headers/sdk for all the libs ("_DEVEL"?)
 # IDEA: note external deps for products, so they are only checked if needed
 # There can be required or optional external deps, required will also result
 # in automatic disabling of product building
 # TODO: some products have multiple optional requirements, but need at least one.
 # See APP_CONVERTER, FILEMANAGER_*
 
 # building tools
 calligra_define_product(BUILDTOOL_RNG2CPP "rng2cpp")
 
 # Calligra-independent utility libs
 calligra_define_product(LIB_KOVECTORIMAGE "libkovectorimage")
 
 # calligra libs
 calligra_define_product(LIB_CALLIGRA "Calligra core libs"  REQUIRES BUILDTOOL_RNG2CPP)
 calligra_define_product(LIB_KOMAIN "Lib for one-file-per-window apps"  REQUIRES LIB_CALLIGRA)
 calligra_define_product(LIB_KOPAGEAPP "Lib for paged documents"  REQUIRES LIB_CALLIGRA LIB_KOMAIN)
 calligra_define_product(LIB_KOODF2 "libkoodf2"  REQUIRES LIB_CALLIGRA)
 calligra_define_product(LIB_KOODFREADER "libkoodfreader"  REQUIRES LIB_KOODF2 LIB_CALLIGRA)
 calligra_define_product(LIB_MSO "libmso"  REQUIRES LIB_CALLIGRA)
 calligra_define_product(LIB_KOMSOOXML "libkomsooxml"  REQUIRES LIB_CALLIGRA LIB_KOODF2 LIB_KOMAIN)
 
 # features
 calligra_define_feature(FEATURE_SCRIPTING  UNMAINTAINED  "Scripting feature")
 calligra_define_feature(FEATURE_RDF  UNMAINTAINED "RDF feature")
 
 # plugins
 calligra_define_product(PLUGIN_TEXTSHAPE "Text shape plugin"  REQUIRES LIB_CALLIGRA)
 calligra_define_product(PLUGIN_PICTURESHAPE "Picture shape plugin" REQUIRES LIB_CALLIGRA)
 
 # parts
 calligra_define_product(PART_WORDS "Words engine"  REQUIRES LIB_CALLIGRA LIB_KOMAIN PLUGIN_TEXTSHAPE)
 calligra_define_product(PART_STAGE "Stage engine"  REQUIRES LIB_CALLIGRA LIB_KOMAIN LIB_KOPAGEAPP PLUGIN_TEXTSHAPE PLUGIN_PICTURESHAPE)
 calligra_define_product(PART_SHEETS "Sheets engine"  REQUIRES LIB_CALLIGRA LIB_KOMAIN)
 calligra_define_product(PART_QTQUICK "QtQuick Plugin that provides Calligra components"  UNPORTED REQUIRES PART_WORDS PART_STAGE)# SHEETS_PART)
 calligra_define_product(PART_COMPONENTS "QtQuick2 Plugin that provides Calligra components"  REQUIRES PART_WORDS PART_STAGE PART_SHEETS)
 
 # apps
 calligra_define_product(APP_WORDS "Words app (for Desktop)"  REQUIRES PART_WORDS)
 calligra_define_product(APP_STAGE "Stage app (for Desktop)"   REQUIRES PART_STAGE)
 calligra_define_product(APP_SHEETS "Sheets app (for Desktop)" REQUIRES PART_SHEETS)
 calligra_define_product(APP_KARBON "Karbon app (for Desktop)"  REQUIRES LIB_CALLIGRA LIB_KOMAIN LIB_KOPAGEAPP)
 calligra_define_product(APP_BRAINDUMP "Braindump app (for Desktop)"  UNMAINTAINED  REQUIRES LIB_CALLIGRA LIB_KOMAIN)
-calligra_define_product(DOC "Calligra Documentations" STAGING)
+calligra_define_product(DOC "Calligra Documentations")
 
 # staging apps
 calligra_define_product(APP_GEMINI "The Calligra Gemini application"  REQUIRES PART_COMPONENTS)
 # TODO: this needs to be split up by app products
 
 
 # extras
 calligra_define_product(APP_CONVERTER "Format converter for commandline" REQUIRES LIB_CALLIGRA LIB_KOMAIN)
 calligra_define_product(FILEMANAGER_PROPERTIES "Plugin for the KDE file properties dialog"  REQUIRES LIB_CALLIGRA)
 calligra_define_product(FILEMANAGER_THUMBNAIL "Plugins for KDE filesystem thumbnailing"  REQUIRES LIB_CALLIGRA LIB_KOMAIN)
 calligra_define_product(FILEMANAGER_QUICKPRINT "Plugin for the filemanager adding a \"Print\" action")
 calligra_define_product(FILEMANAGER_TEMPLATES "File templates for filemanager")
 calligra_define_product(OKULAR_GENERATOR_ODP "Plugin for Okular adding support for ODP"  REQUIRES PART_STAGE)
 calligra_define_product(OKULAR_GENERATOR_ODT "Plugin for Okular adding support for ODT"  REQUIRES PART_WORDS)
 
 # more plugins
 calligra_define_product(PLUGIN_COLORENGINES "Colorengine plugins"  REQUIRES LIB_CALLIGRA)
 calligra_define_product(PLUGIN_MUSICSHAPE "Music shape plugin"  REQUIRES LIB_CALLIGRA)
 calligra_define_product(PLUGIN_SPACENAVIGATOR "SpaceNavigator input plugin"  REQUIRES LIB_CALLIGRA)
 calligra_define_product(PLUGIN_ARTISTICTEXTSHAPE "Artistic shape plugin" REQUIRES LIB_CALLIGRA)
 calligra_define_product(PLUGIN_DOCKERS "Default dockers plugin" REQUIRES LIB_CALLIGRA)
 calligra_define_product(PLUGIN_TEXTEDITING "Textediting plugins"  REQUIRES LIB_CALLIGRA)
 calligra_define_product(PLUGIN_DEFAULTTOOLS "Default Flake tools plugin" REQUIRES LIB_CALLIGRA)
 calligra_define_product(PLUGIN_PATHSHAPES "Path shape plugins" REQUIRES LIB_CALLIGRA)
 calligra_define_product(PLUGIN_VARIABLES "Text variables plugin"  REQUIRES LIB_CALLIGRA)
 calligra_define_product(PLUGIN_CHARTSHAPE "Chart shape plugin"  REQUIRES LIB_CALLIGRA LIB_KOMAIN)
 calligra_define_product(PLUGIN_PLUGINSHAPE "Plugin shape plugin" REQUIRES LIB_CALLIGRA LIB_KOMAIN)
 calligra_define_product(PLUGIN_FORMULASHAPE "Formula shape plugin"  REQUIRES LIB_CALLIGRA LIB_KOMAIN)
 calligra_define_product(PLUGIN_VIDEOSHAPE "Plugin for handling videos in Calligra" REQUIRES LIB_CALLIGRA)
 calligra_define_product(PLUGIN_VECTORSHAPE "Vectorgraphic shape plugin"  REQUIRES LIB_CALLIGRA LIB_KOVECTORIMAGE)
 calligra_define_product(PLUGIN_SEMANTICITEMS "Semantic items plugins" REQUIRES FEATURE_RDF LIB_CALLIGRA)
 calligra_define_product(PLUGIN_SHAPEFILTEREFFECTS "Default shape filtereffects plugin" REQUIRES LIB_CALLIGRA)
 calligra_define_product(PLUGIN_STENCILSDOCKER "Stencils docker plugin" REQUIRES LIB_CALLIGRA)
 calligra_define_product(PLUGIN_KARBONPLUGINS "Semantic items plugins" REQUIRES LIB_CALLIGRA)
 calligra_define_product(PLUGIN_CALLIGRAGEMINI_GIT "Git support plugin for Calligra Gemini")
 
 # staging plugins
 calligra_define_product(PLUGIN_THREEDSHAPE "3D shape plugin"  STAGING  REQUIRES LIB_CALLIGRA)
 
 # Sheets filters
 calligra_define_product(FILTER_XLSX_TO_ODS "XLSX to ODS filter"  REQUIRES LIB_KOMSOOXML PART_SHEETS)
 calligra_define_product(FILTER_XLS_TO_SHEETS "Sheets XLS import filter"  REQUIRES LIB_MSO LIB_KOMSOOXML PART_SHEETS)
 calligra_define_product(FILTER_SHEETS_TO_XLS "Sheets XLS export filter"  REQUIRES LIB_MSO LIB_KOMSOOXML PART_SHEETS)
 calligra_define_product(FILTER_CSV_TO_SHEETS "Sheets CSV import filter"  REQUIRES PART_SHEETS)
 calligra_define_product(FILTER_SHEETS_TO_CSV "Sheets CSV export filter"  REQUIRES  PART_SHEETS)
 calligra_define_product(FILTER_APPLIXSPREAD_TO_KSPREAD "Applix Spreadsheet to KSpread filter"  REQUIRES PART_SHEETS)
 calligra_define_product(FILTER_DBASE_TO_KSPREAD "dBASE to KSpread filter"  REQUIRES LIB_KOMAIN)
 calligra_define_product(FILTER_GNUMERIC_TO_SHEETS "Sheets GNUMERIC import filter"  REQUIRES PART_SHEETS)
 calligra_define_product(FILTER_SHEETS_TO_GNUMERIC "Sheets GNUMERIC import filter"  REQUIRES PART_SHEETS)
 calligra_define_product(FILTER_OPENCALC_TO_SHEETS "Sheets OpenOffice.org Calc import filter"  REQUIRES PART_SHEETS)
 calligra_define_product(FILTER_SHEETS_TO_OPENCALC "Sheets OpenOffice.org Calc export filter"  REQUIRES PART_SHEETS)
 calligra_define_product(FILTER_QUATTROPRO_TO_SHEETS "Sheets Quattro Pro import filter"  REQUIRES PART_SHEETS)
 calligra_define_product(FILTER_HTML_TO_ODS "HTML to ODS filter"  REQUIRES LIB_KOMAIN)
 calligra_define_product(FILTER_SHEETS_TO_HTML "Sheets HTML export filter"  REQUIRES PART_SHEETS)
 calligra_define_product(FILTER_KSPREAD_TO_LATEX "KSpread to LaTeX filter"  REQUIRES LIB_KOMAIN)
 
 # odg filters
 calligra_define_product(FILTER_VISIO_TO_ODG "Visio to ODG filter"  REQUIRES LIB_KOMAIN)
 calligra_define_product(FILTER_WPG_TO_ODG "WPG to ODG filter" REQUIRES LIB_KOMAIN)
 
 # Stage filters
 calligra_define_product(FILTER_KEY_TO_ODP "Apple Keynote to ODP filter"  REQUIRES LIB_KOMAIN)
 calligra_define_product(FILTER_KPR_TO_ODP "KPresenter to ODP filter"  REQUIRES LIB_KOMAIN)
 calligra_define_product(FILTER_PPT_TO_ODP "PPT to OPD filter"  REQUIRES LIB_MSO LIB_KOMAIN)
 calligra_define_product(FILTER_PPTX_TO_ODP "PPTX to ODP filter"  REQUIRES LIB_KOMSOOXML LIB_KOODF2 LIB_KOMAIN)
 
 # Words filters
 calligra_define_product(FILTER_DOC_TO_ODT "DOC to ODT filter"  REQUIRES LIB_MSO LIB_KOMSOOXML LIB_KOMAIN)
 calligra_define_product(FILTER_DOCX_TO_ODT "DOCX to ODT filter"  REQUIRES LIB_KOMSOOXML LIB_KOODF2 LIB_KOMAIN)
 calligra_define_product(FILTER_ODT_TO_DOCX "ODT to DOCX filter" REQUIRES LIB_KOODFREADER LIB_KOODF2 LIB_KOMAIN)
 calligra_define_product(FILTER_WORDPERFECT_TO_ODT "Word Perfect to ODT filter"  REQUIRES LIB_KOMAIN)
 calligra_define_product(FILTER_WORKS_TO_ODT "MS Works to ODT filter"  REQUIRES LIB_KOMAIN)
 calligra_define_product(FILTER_APPLIXWORD_TO_ODT "Applixword to ODT filter"  REQUIRES LIB_KOMAIN)
 calligra_define_product(FILTER_ASCII_TO_WORDS "Words ASCII import filter"  REQUIRES PART_WORDS LIB_KOODF2 LIB_KOMAIN)
 calligra_define_product(FILTER_ODT_TO_ASCII "ODT to ASCII filter" REQUIRES LIB_KOODFREADER LIB_KOMAIN)
 calligra_define_product(FILTER_RTF_TO_ODT "RTF to ODT filter"  REQUIRES LIB_KOMAIN)
 calligra_define_product(FILTER_ODT_TO_MOBI "Mobi export filter" REQUIRES LIB_KOMAIN)
 calligra_define_product(FILTER_ODT_TO_EPUB2 "ODT Epub2 export filter" REQUIRES LIB_KOVECTORIMAGE LIB_KOMAIN)
 calligra_define_product(FILTER_ODT_TO_HTML "ODT HTML export filter" REQUIRES LIB_KOVECTORIMAGE LIB_KOMAIN)
 calligra_define_product(FILTER_ODT_TO_WIKI "ODT Wiki export filter" REQUIRES LIB_KOODFREADER LIB_KOODF2 LIB_KOMAIN)
 
 # Karbon filters
 calligra_define_product(FILTER_EPS_TO_SVG_AI "EPS to SVG/AI filter"  REQUIRES LIB_KOMAIN)
 calligra_define_product(FILTER_XFIG_TO_ODG "XFig to ODG filter"  REQUIRES LIB_KOMAIN)
 calligra_define_product(FILTER_PDF_TO_SVG "PDF to SVG filter"  REQUIRES LIB_KOMAIN)
 calligra_define_product(FILTER_WPG_TO_SVG "WPG to SVG filter"  REQUIRES LIB_KOMAIN)
 calligra_define_product(FILTER_KARBON_TO_IMAGE "Karbon image export filter"  REQUIRES APP_KARBON)
 calligra_define_product(FILTER_KARBON_TO_SVG "Karbon SVG export filter"  REQUIRES APP_KARBON)
 calligra_define_product(FILTER_SVG_TO_KARBON "Karbon SVG import filter"  REQUIRES APP_KARBON)
 calligra_define_product(FILTER_KARBON_TO_WMF "Karbon WMF export filter" REQUIRES APP_KARBON)
 calligra_define_product(FILTER_WMF_TO_SVG "WMF to SVG filter"  REQUIRES LIB_KOVECTORIMAGE LIB_KOMAIN)
 calligra_define_product(FILTER_KARBON1X_TO_KARBON "Karbon 1.x import filter"  REQUIRES APP_KARBON)
 
 # meta apps
 calligra_define_product(APP_CALLIGRA "General Calligra app starter"  REQUIRES LIB_CALLIGRA LIB_KOMAIN)
 
 # more extras
 calligra_define_product(OKULAR_GENERATOR_PPT "Plugin for Okular extended with support for PPT"  REQUIRES OKULAR_GENERATOR_ODP FILTER_PPT_TO_ODP)
 calligra_define_product(OKULAR_GENERATOR_PPTX "Plugin for Okular extended with support for PPTX"  REQUIRES OKULAR_GENERATOR_ODP FILTER_PPTX_TO_ODP)
 calligra_define_product(OKULAR_GENERATOR_DOC "Plugin for Okular extended with support for DOC"  REQUIRES OKULAR_GENERATOR_ODT FILTER_DOC_TO_ODT)
 calligra_define_product(OKULAR_GENERATOR_DOCX "Plugin for Okular extended with support for DOCX"  REQUIRES OKULAR_GENERATOR_ODT FILTER_DOCX_TO_ODT)
 calligra_define_product(OKULAR_GENERATOR_RTF "Plugin for Okular extended with support for RTF"  REQUIRES OKULAR_GENERATOR_ODT FILTER_RTF_TO_ODT)
 calligra_define_product(OKULAR_GENERATOR_WORDPERFECT "Plugin for Okular extended with support for WORDPERFECT"  REQUIRES OKULAR_GENERATOR_ODT FILTER_WORDPERFECT_TO_ODT)
 
 # developer utils
 calligra_define_product(APP_SLIDECOMPARE "slidecompare"  REQUIRES LIB_CALLIGRA LIB_KOMAIN FILTER_PPT_TO_ODP)
 calligra_define_product(APP_DEVTOOLS "Tools for developers")
 calligra_define_product(APP_CSTESTER "cstester" REQUIRES PART_SHEETS PART_STAGE PART_WORDS)
 
 # development
 calligra_define_product(DEVEL_HEADERS "Headers of libraries"  UNPORTED)
 
 #############################################
 ####      Product set definitions        ####
 #############################################
 
 # For defining new productsets see end of this file,
 # "How to add another productset?"
 
 # filter sets
 calligra_define_productset(FILTERS_SHEETS_IMPORT "All Sheets import filters"
     OPTIONAL
         FILTER_XLSX_TO_ODS
         FILTER_XLS_TO_SHEETS
         FILTER_CSV_TO_SHEETS
         FILTER_APPLIXSPREAD_TO_KSPREAD
         FILTER_DBASE_TO_KSPREAD
         FILTER_GNUMERIC_TO_SHEETS
         FILTER_OPENCALC_TO_SHEETS
         FILTER_QUATTROPRO_TO_SHEETS
         FILTER_HTML_TO_ODS
 )
 calligra_define_productset(FILTERS_SHEETS_EXPORT "All Sheets export filters"
     OPTIONAL
         FILTER_SHEETS_TO_XLS
         FILTER_SHEETS_TO_CSV
         FILTER_SHEETS_TO_GNUMERIC
         FILTER_SHEETS_TO_OPENCALC
         FILTER_SHEETS_TO_HTML
         FILTER_KSPREAD_TO_LATEX
 )
 calligra_define_productset(FILTERS_SHEETS "All Sheets filters"
     OPTIONAL
         FILTERS_SHEETS_IMPORT
         FILTERS_SHEETS_EXPORT
 )
 calligra_define_productset(FILTERS_ODG_IMPORT "All odg import filters"
     OPTIONAL
         FILTER_VISIO_TO_ODG
         FILTER_WPG_TO_ODG
 )
 
 calligra_define_productset(FILTERS_ODG "All odg filters"
     OPTIONAL
         FILTERS_ODG_IMPORT
 )
 
 calligra_define_productset(FILTERS_STAGE_IMPORT "All Stage import filters"
     OPTIONAL
         FILTER_KEY_TO_ODP
         FILTER_KPR_TO_ODP
         FILTER_PPT_TO_ODP
         FILTER_PPTX_TO_ODP
 )
 #calligra_define_productset(FILTERS_STAGE_EXPORT "All Stage export filters"  OPTIONAL ) none currently
 calligra_define_productset(FILTERS_STAGE "All Stage filters"
     OPTIONAL
         FILTERS_STAGE_IMPORT
 #         FILTERS_STAGE_EXPORT
 )
 calligra_define_productset(FILTERS_WORDS_IMPORT "All Words import filters"
     OPTIONAL
         FILTER_DOC_TO_ODT
         FILTER_DOCX_TO_ODT
         FILTER_WORDPERFECT_TO_ODT
         FILTER_WORKS_TO_ODT
         FILTER_APPLIXWORD_TO_ODT
         FILTER_ASCII_TO_WORDS
         FILTER_RTF_TO_ODT
 )
 calligra_define_productset(FILTERS_WORDS_EXPORT "All Words export filters"
     OPTIONAL
         FILTER_ODT_TO_ASCII
         FILTER_ODT_TO_MOBI
         FILTER_ODT_TO_EPUB2
         FILTER_ODT_TO_HTML
         FILTER_ODT_TO_DOCX
         FILTER_ODT_TO_WIKI
 )
 calligra_define_productset(FILTERS_WORDS "All Words filters"
     OPTIONAL
         FILTERS_WORDS_IMPORT
         FILTERS_WORDS_EXPORT
 )
 calligra_define_productset(FILTERS_KARBON_IMPORT "All Karbon import filters"
     OPTIONAL
         FILTER_EPS_TO_SVG_AI
         FILTER_XFIG_TO_ODG
         FILTER_PDF_TO_SVG
         FILTER_WPG_TO_SVG
         FILTER_SVG_TO_KARBON
         FILTER_WMF_TO_SVG
         FILTER_KARBON1X_TO_KARBON
 )
 calligra_define_productset(FILTERS_KARBON_EXPORT "All Karbon export filters"
     OPTIONAL
         FILTER_KARBON_TO_IMAGE
         FILTER_KARBON_TO_SVG
         FILTER_KARBON_TO_WMF
 )
 calligra_define_productset(FILTERS_KARBON "All Karbon filters"
     OPTIONAL
         FILTERS_KARBON_IMPORT
         FILTERS_KARBON_EXPORT
 )
 
 # filemanager
 calligra_define_productset(FILEMANAGER "Extensions for the filemanager"
     OPTIONAL
         FILEMANAGER_PROPERTIES
         FILEMANAGER_QUICKPRINT
         FILEMANAGER_TEMPLATES
         FILEMANAGER_THUMBNAIL
 )
 
 # apps
 calligra_define_productset(BRAINDUMP "Full Braindump (for Desktop)"
     REQUIRES
         APP_BRAINDUMP
     OPTIONAL
         # plugins
         PLUGIN_ARTISTICTEXTSHAPE
         PLUGIN_CHARTSHAPE
         PLUGIN_DEFAULTTOOLS
         PLUGIN_DOCKERS
         PLUGIN_FORMULASHAPE
         PLUGIN_MUSICSHAPE
         PLUGIN_PATHSHAPES
         PLUGIN_PICTURESHAPE
         PLUGIN_PLUGINSHAPE
         PLUGIN_TEXTEDITING
         PLUGIN_TEXTSHAPE
         PLUGIN_THREEDSHAPE
         PLUGIN_VARIABLES
         PLUGIN_VECTORSHAPE
         PLUGIN_VIDEOSHAPE
 )
 
 calligra_define_productset(KARBON "Full Karbon (for Desktop)"
     REQUIRES
         APP_KARBON
         PLUGIN_KARBONPLUGINS
         PLUGIN_SHAPEFILTEREFFECTS
     OPTIONAL
         # extras
         FILEMANAGER
         # plugins
         PLUGIN_ARTISTICTEXTSHAPE
         PLUGIN_CHARTSHAPE
         PLUGIN_DEFAULTTOOLS
         PLUGIN_DOCKERS
         PLUGIN_FORMULASHAPE
         PLUGIN_PATHSHAPES
         PLUGIN_PICTURESHAPE
         PLUGIN_PLUGINSHAPE
         PLUGIN_STENCILSDOCKER
         PLUGIN_TEXTEDITING
         PLUGIN_TEXTSHAPE
         PLUGIN_VARIABLES
         PLUGIN_VECTORSHAPE
         # filters
         FILTERS_KARBON
         FILTERS_ODG
 )
 calligra_define_productset(SHEETS "Full Sheets (for Desktop)"
     REQUIRES
         APP_SHEETS
     OPTIONAL
         # extras
         FILEMANAGER
         # feature
         FEATURE_SCRIPTING
         # plugins
         PLUGIN_ARTISTICTEXTSHAPE
         PLUGIN_CHARTSHAPE
         PLUGIN_DEFAULTTOOLS
         PLUGIN_DOCKERS
         PLUGIN_FORMULASHAPE
         PLUGIN_PATHSHAPES
         PLUGIN_PICTURESHAPE
         PLUGIN_PLUGINSHAPE
         PLUGIN_TEXTEDITING
         PLUGIN_TEXTSHAPE
         PLUGIN_VARIABLES
         PLUGIN_VECTORSHAPE
         # filters
         FILTERS_SHEETS
 )
 calligra_define_productset(STAGE "Full Stage (for Desktop)"
     REQUIRES
         APP_STAGE
     OPTIONAL
         # extras
         FILEMANAGER
         # plugins
         PLUGIN_ARTISTICTEXTSHAPE
         PLUGIN_CHARTSHAPE
         PLUGIN_DEFAULTTOOLS
         PLUGIN_DOCKERS
         PLUGIN_FORMULASHAPE
         PLUGIN_PATHSHAPES
         PLUGIN_PICTURESHAPE
         PLUGIN_PLUGINSHAPE
         PLUGIN_TEXTEDITING
         PLUGIN_TEXTSHAPE
         PLUGIN_STENCILSDOCKER
         PLUGIN_VARIABLES
         PLUGIN_VECTORSHAPE
         PLUGIN_VIDEOSHAPE
         # filters
         FILTERS_STAGE
 )
 calligra_define_productset(WORDS "Full Words (for Desktop)"
     REQUIRES
         APP_WORDS
     OPTIONAL
         # extras
         FILEMANAGER
         # plugins
         PLUGIN_ARTISTICTEXTSHAPE
         PLUGIN_CHARTSHAPE
         PLUGIN_DEFAULTTOOLS
         PLUGIN_DOCKERS
         PLUGIN_FORMULASHAPE
         PLUGIN_PATHSHAPES
         PLUGIN_PICTURESHAPE
         PLUGIN_PLUGINSHAPE
         PLUGIN_SEMANTICITEMS
         PLUGIN_STENCILSDOCKER
         PLUGIN_TEXTEDITING
         PLUGIN_TEXTSHAPE
         PLUGIN_VARIABLES
         PLUGIN_VECTORSHAPE
         # filters
         FILTERS_WORDS
 )
 calligra_define_productset(GEMINI "Calligra for 2:1 devices"
     REQUIRES
         APP_GEMINI
     OPTIONAL
         # plugins
         PLUGIN_ARTISTICTEXTSHAPE
         PLUGIN_CALLIGRAGEMINI_GIT
         PLUGIN_CHARTSHAPE
         PLUGIN_DEFAULTTOOLS
         PLUGIN_DOCKERS
         PLUGIN_FORMULASHAPE
         PLUGIN_PATHSHAPES
         PLUGIN_PICTURESHAPE
         PLUGIN_PLUGINSHAPE
         PLUGIN_TEXTEDITING
         PLUGIN_TEXTSHAPE
         PLUGIN_VARIABLES
         PLUGIN_VECTORSHAPE
         PLUGIN_VIDEOSHAPE
         # filters
         FILTERS_WORDS
         FILTERS_STAGE
 )
 
 # okular support
 calligra_define_productset(OKULAR "Okular generators"
     OPTIONAL
         OKULAR_GENERATOR_ODP
         OKULAR_GENERATOR_PPT
         OKULAR_GENERATOR_PPTX
         OKULAR_GENERATOR_ODT
         OKULAR_GENERATOR_DOC
         OKULAR_GENERATOR_DOCX
         OKULAR_GENERATOR_RTF
         OKULAR_GENERATOR_WORDPERFECT
 )
 
 
 # How to add another product?
 # ===========================
 #
 # 1. Define the product by a call of calligra_define_product,
 #    e.g.
 #
 #    calligra_define_product(MYPRODUCT "title of product")
 #
 #    For the product id use a proper prefix (LIB_, PLUGIN_, FILTER_, APP_, PART_,
 #     ...), whatever is appropriate.
 #
 # 2. Extend that call with a REQUIRES argument section, if the product has
 #    hard internal build-time dependencies on other products or features.
 #    Products/features that are listed as dependencies have to be defined before
 #    (see also the API doc in cmake/modules/CalligraProductSetMacros.cmake)
 #    E.g.
 #
 #    calligra_define_product(MYPRODUCT "title of product"  REQUIRES P1 P2)
 #
 # 3. Add a rule when to not build the product, in the section "Detect which
 #    products/features can be compiled" of the toplevel CMakeLists.txt. Each
 #    product should have their own boolean expression when to set the build flag
 #    to FALSE, e.g.
 #
 #    if (PLATFORMX OR NOT EXTERNAL_DEP_X_FOUND)
 #      set(SHOULD_BUILD_MYPRODUCT FALSE)
 #    endif ()
 #
 # 4. Wrap everything belonging to the product with the build flag of the product.
 #    Ideally this is done around subdirectory inclusions, results in easier code.
 #    e.g.
 #
 #    if (SHOULD_BUILD_MYPRODUCT)
 #      add_subdirectory(myproduct)
 #    endif ()
 #
 # 5. Tag the product as STAGING, if it is not yet ready for release, but already
 #    integrated in the master branch, e.g.
 #
 #    calligra_define_product(MYPRODUCT "title of product" STAGING REQUIRES P1)
 #
 # 6. Add the product to all products, features and product sets which have this
 #    product as REQUIRED or OPTIONAL dependency.
 #
 #
 # How to add another feature?
 # ===========================
 #
 # 1. Define the feature by a call of calligra_define_feature,
 #    e.g.
 #
 #    calligra_define_feature(MYFEATURE "title of feature")
 #
 #    For the feature id use a proper prefix (FEATURE_, ...), whatever is
 #    appropriate.
 #
 # 2. Extend that call with a REQUIRES argument section, if the feature has
 #    hard internal build-time dependencies on other products or features.
 #    Products or features that are listed as dependencies have to be defined
 #    before
 #    (see also the API doc in cmake/modules/CalligraProductSetMacros.cmake)
 #    E.g.
 #
 #    calligra_define_feature(MYFEATURE "title of feature"  REQUIRES P1 F1)
 #
 # 3. Add a rule when to not build the feature, in the section "Detect which
 #    products/features can be compiled" of the toplevel CMakeLists.txt. Each
 #    feature should have their own boolean expression when to set the build flag
 #    to FALSE, e.g.
 #
 #    if (PLATFORMX OR NOT EXTERNAL_DEP_X_FOUND)
 #      set(SHOULD_BUILD_MYFEATURE FALSE)
 #    endif ()
 #
 # 4. Wrap everything belonging to the feature with the build flag of the feature.
 #    Ideally this is done around subdirectory inclusions, results in easier code.
 #    e.g.
 #
 #    if (SHOULD_BUILD_MYFEATURE)
 #      add_subdirectory(myproduct)
 #    endif ()
 #
 # 5. Tag the feature as STAGING, if it is not yet ready for release, but already
 #    integrated in the master branch, e.g.
 #
 #    calligra_define_product(MYFEATURE "title of feature" STAGING REQUIRES P1 F1)
 #
 # 6. Add the feature to all products, features and product sets which have this
 #    product as REQUIRED or OPTIONAL dependency.
 #
 #
 # How to add another productset?
 # ==============================
 #
 # There are two possible places to put a productset definition. The first is to
 # add it to this file, which should be done for more generic sets that are
 # useful for many people. The second is a file of its own, in the directory
 # "cmake/productsets", which should be done for more special ones or for those
 # which should not be added to the repository.
 # The file must be named with the name of the productset in lowercase and have
 # the extension ".cmake".
 #
 # 1. Define the productset by a call of calligra_define_productset,
 #    e.g.
 #
 #    calligra_define_productset(MYPRODUCTSET "title of productset")
 #
 # 2. Extend that call with REQUIRES or OPTIONAL argument sections, if the productset
 #    has hard or soft internal dependencies on other products, features or
 #    productsets.
 #    Products, features or productsets that are listed as dependencies have to
 #    be defined before
 #    (see also the API doc in cmake/modules/CalligraProductSetMacros.cmake)
 #    E.g.
 #
 #    calligra_define_productset(MYPRODUCT "title of product"
 #                               REQUIRES P1 P2 F1 PS1
 #                               OPTIONAL P3 F2 PS2)
 #
 # 3. Add the productset to all product sets which have this product set as
 #     REQUIRED or OPTIONAL dependency.
 #
 # Example for a file-based productset definition:
 # You want a productset "MYWORDS". For that you add a file named
 # "mywords.cmake" into the directory "cmake/productsets", with the content:
 # --- 8< ---
 # calligra_define_productset(MYWORDS "My Words"
 #     REQUIRES
 #         APP_WORDS
 #         PLUGIN_DEFAULTTOOLS
 #         PLUGIN_DOCKERS
 #         PLUGIN_PATHSHAPES
 #         PLUGIN_VARIABLES
 #         PLUGIN_TEXTSHAPE
 #         PLUGIN_PLUGINSHAPE
 #         PLUGIN_FORMULASHAPE
 # )
 # --- 8< ---
diff --git a/sheets/org.kde.calligrasheets.desktop b/sheets/org.kde.calligrasheets.desktop
index 85e6ae9b460..2307bcd72f9 100644
--- a/sheets/org.kde.calligrasheets.desktop
+++ b/sheets/org.kde.calligrasheets.desktop
@@ -1,134 +1,134 @@
 [Desktop Entry]
 Name=Calligra Sheets
 Name[bs]=Calligra Tablice
 Name[ca]=Sheets del Calligra
 Name[ca@valencia]=Sheets del Calligra
 Name[cs]=Calligra Sheets
 Name[da]=Calligra Sheets
 Name[de]=Calligra Sheets
 Name[el]=Calligra Sheets
 Name[en_GB]=Calligra Sheets
 Name[es]=Calligra Sheets
 Name[et]=Calligra Sheets
 Name[eu]=Calligra Sheets
 Name[fi]=Calligra Sheets
 Name[fr]=Calligra Sheets
 Name[gl]=Calligra Sheets
 Name[hu]=Calligra munkalapok
 Name[it]=Calligra Sheets
 Name[ja]=Calligra Sheets
 Name[kk]=Calligra Sheets
 Name[ko]=Calligra Sheets
 Name[mr]=कॅलिग्रा शीट्स
 Name[nb]=Calligra Sheets
 Name[nl]=Calligra Sheets
 Name[pl]=Arkusze Calligra
 Name[pt]=Calligra Sheets
 Name[pt_BR]=Calligra Sheets
 Name[sk]=Calligra Sheets
 Name[sl]=Calligra Sheets
 Name[sv]=Calligra Sheets
 Name[tr]=Calligra Sheets
 Name[ug]=Calligra ۋاراقلار
 Name[uk]=Calligra Sheets
 Name[x-test]=xxCalligra Sheetsxx
 Name[zh_CN]=Calligra Sheets
 Exec=calligrasheets %U
 GenericName=Spreadsheet
 GenericName[bg]=Електронни таблици
 GenericName[bs]=Tablica
 GenericName[ca]=Full de càlcul
 GenericName[ca@valencia]=Full de càlcul
 GenericName[cs]=Sešit
 GenericName[da]=Regneark
 GenericName[de]=Tabellenkalkulation
 GenericName[el]=Φύλλο εργασίας
 GenericName[en_GB]=Spreadsheet
 GenericName[es]=Hoja de cálculo
 GenericName[et]=Tabelitöötlus
 GenericName[eu]=Kalkulu-orria
 GenericName[fi]=Taulukkolaskenta
 GenericName[fr]=Tableur
 GenericName[fy]=Spreadsheet
 GenericName[ga]=Scarbhileog
 GenericName[gl]=Follas de cálculo
 GenericName[he]=גיליון אלקטרוני
 GenericName[hi]=स्प्रेडशीट
 GenericName[hne]=स्प्रेडसीट
 GenericName[hu]=Munkafüzet
 GenericName[ia]=Folio de calculo electronic
 GenericName[it]=Foglio di calcolo
 GenericName[ja]=表計算
 GenericName[kk]=Электрондық кесте
 GenericName[ko]=스프레드시트
 GenericName[lv]=Tabullapa
 GenericName[mai]=स्प्रेडशीट
 GenericName[mr]=स्प्रेडशीट
 GenericName[nb]=Regneark
 GenericName[nds]=Tabellenutreken
 GenericName[nl]=Spreadsheet
 GenericName[oc]=Fuèlha de calcul
 GenericName[pl]=Arkusz kalkulacyjny
 GenericName[pt]=Folha de cálculo
 GenericName[pt_BR]=Planilha
 GenericName[ru]=Электронные таблицы
 GenericName[sk]=Tabuľkový procesor
 GenericName[sl]=Preglednica
 GenericName[sv]=Kalkylark
 GenericName[tr]=Hesap Tablosu
 GenericName[ug]=ئېلېكترونلۇق جەدۋەل
 GenericName[uk]=Електронні таблиці
 GenericName[wa]=Tåvleu
 GenericName[x-test]=xxSpreadsheetxx
 GenericName[zh_CN]=数据表
 GenericName[zh_TW]=工作表
 Comment=Write spreadsheet documents
 Comment[bg]=Писане на електронни таблици
 Comment[bs]=Napiši Dokumente Tablice
 Comment[ca]=Escriu documents de full de càlcul
 Comment[ca@valencia]=Escriu documents de full de càlcul
 Comment[da]=Skriv regnearksdokumenter
 Comment[de]=Tabellendokumente verfassen
 Comment[el]=Γραφή εγγράφων φύλλου εργασίας
 Comment[en_GB]=Write spreadsheet documents
 Comment[es]=Escribir documentos de hoja de cálculo
 Comment[et]=Tabelidokumentide kirjutamine
 Comment[eu]=Kalkulu-orriak idatzi
 Comment[fi]=Kirjoita taulukkolaskentatiedostoja
 Comment[fr]=Documents tableurs vides
 Comment[ga]=Scríobh cáipéisí scarbhileoige
 Comment[gl]=Escriba documentos de follas de cálculo.
 Comment[hu]=Munkafüzet dokumentumok írása
 Comment[it]=Scrivi fogli di testo
 Comment[ja]=スプレッドシート文書を作成
 Comment[kk]=Эл.кесте құжаттарды жазу
 Comment[ko]=스프레드시트 문서 만들기
 Comment[mr]=स्प्रेडशीट दस्तऐवज लिहा
 Comment[nb]=Skriv regneark-dokumenter
 Comment[nds]=Tabellenutreken opstellen
 Comment[nl]=Rekenbladdocumenten schrijven
 Comment[pl]=Pisz dokumenty arkuszy kalkulacyjnych
 Comment[pt]=Escrever documentos de folhas de cálculo
 Comment[pt_BR]=Escrever documentos de planilha
 Comment[ru]=Редактирование таблиц
 Comment[sk]=Písanie tabuľkových dokumentov
 Comment[sl]=Pišite dokumente s preglednicami
 Comment[sv]=Skriv kalkylarksdokument
 Comment[tr]=Çizelge belgeleri oluşturun
 Comment[ug]=جەدۋەل پۈتۈكلىرى(Excel غا ئوخشاش) نى يېزىش پروگراممىسى
 Comment[uk]=Створення електронних таблиць
 Comment[wa]=Sicrire des documints tåvleas
 Comment[x-test]=xxWrite spreadsheet documentsxx
 Comment[zh_CN]=编写电子表格文档
 Comment[zh_TW]=撰寫工作表文件
 MimeType=application/vnd.oasis.opendocument.spreadsheet;application/x-kspread;application/vnd.ms-excel;text/csv;application/x-quattropro;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.openxmlformats-officedocument.spreadsheetml.template;
 Type=Application
 Icon=calligrasheets
 X-KDE-ServiceTypes=Calligra/Application
 X-Calligra-DefaultMimeTypes=application/vnd.oasis.opendocument.spreadsheet,application/x-kspread,application/vnd.ms-excel,text/csv,application/x-quattropro,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.openxmlformats-officedocument.spreadsheetml.template
 X-KDE-NativeMimeType=application/vnd.oasis.opendocument.spreadsheet
 X-DBUS-StartupType=multi
 X-DBUS-ServiceName=org.kde.calligrasheets
-X-DocPath=sheets/index.html
+X-DocPath=calligrasheets/index.html
 X-KDE-StartupNotify=true
 Categories=Qt;KDE;Office;Spreadsheet;
diff --git a/stage/app/org.kde.calligrastage.desktop b/stage/app/org.kde.calligrastage.desktop
index d62c8ffbff2..2e4d1540003 100644
--- a/stage/app/org.kde.calligrastage.desktop
+++ b/stage/app/org.kde.calligrastage.desktop
@@ -1,139 +1,139 @@
 [Desktop Entry]
 Type=Application
 Name=Calligra Stage
 Name[bg]=Calligra Stage
 Name[bs]=Calligra scena
 Name[ca]=Stage del Calligra
 Name[ca@valencia]=Stage del Calligra
 Name[cs]=Calligra Stage
 Name[da]=Calligra Stage
 Name[de]=Calligra Stage
 Name[el]=Calligra Stage
 Name[en_GB]=Calligra Stage
 Name[es]=Calligra Stage
 Name[et]=Calligra Stage
 Name[eu]=Calligra Stage
 Name[fi]=Calligra Stage
 Name[fr]=Calligra Stage
 Name[gl]=Calligra Stage
 Name[hu]=Calligra Stage
 Name[it]=Calligra Stage
 Name[ja]=Calligra Stage
 Name[kk]=Calligra Stage
 Name[ko]=Calligra Stage
 Name[mr]=कॅलिग्रा स्टेज
 Name[nb]=Calligra Stage
 Name[nds]=Calligra-Stage
 Name[nl]=Calligra Stage
 Name[pl]=Scena Calligra
 Name[pt]=Calligra Stage
 Name[pt_BR]=Calligra Stage
 Name[ru]=Calligra Stage
 Name[sk]=Calligra Stage
 Name[sl]=Calligra Stage
 Name[sv]=Calligra Stage
 Name[tr]=Calligra Stage
 Name[ug]=Calligra Stage
 Name[uk]=Calligra Stage
 Name[x-test]=xxCalligra Stagexx
 Name[zh_CN]=Calligra Stage
 Name[zh_TW]=Calligra Stage
 Exec=calligrastage %U
 GenericName=Presentation
 GenericName[bg]=Екранни презентации
 GenericName[bs]=Prezentacija
 GenericName[ca]=Presentació
 GenericName[ca@valencia]=Presentació
 GenericName[cs]=Prezentace
 GenericName[da]=Præsentation
 GenericName[de]=Präsentation
 GenericName[el]=Παρουσίαση
 GenericName[en_GB]=Presentation
 GenericName[es]=Presentación
 GenericName[et]=Esitlus
 GenericName[eu]=Aurkezpena
 GenericName[fi]=Esitysgrafiikka
 GenericName[fr]=Présentation
 GenericName[fy]=Presintaasje
 GenericName[ga]=Láithreoireacht
 GenericName[gl]=Edición e reprodución de presentacións
 GenericName[he]=מצגת
 GenericName[hi]=प्रस्तुतीकरण
 GenericName[hne]=प्रस्तुतीकरन
 GenericName[hr]=Prezentacija
 GenericName[hu]=Bemutató
 GenericName[ia]=Presentation
 GenericName[it]=Presentazione
 GenericName[ja]=プレゼンテーション
 GenericName[kk]=Презентация
 GenericName[ko]=프레젠테이션
 GenericName[lv]=Prezentācija
 GenericName[mai]=प्रस्तुति
 GenericName[mr]=प्रेझेंटेशन
 GenericName[nb]=Presentasjon
 GenericName[nds]=Presentatschoon
 GenericName[nl]=Presentatie
 GenericName[oc]=Presentacion
 GenericName[pl]=Prezentacja
 GenericName[pt]=Apresentação
 GenericName[pt_BR]=Apresentação
 GenericName[ru]=Презентации
 GenericName[sk]=Prezentácia
 GenericName[sl]=Predstavitev
 GenericName[sv]=Presentation
 GenericName[tg]=Тақдим
 GenericName[tr]=Sunum
 GenericName[ug]=سۇنۇلما
 GenericName[uk]=Презентація
 GenericName[wa]=Prezintaedje
 GenericName[x-test]=xxPresentationxx
 GenericName[zh_CN]=演示
 GenericName[zh_TW]=簡報
 Comment=Write presentation documents
 Comment[bg]=Създаване на документи за презентации
 Comment[bs]=Napišite prezentacijske dokumente
 Comment[ca]=Escriu documents de presentació
 Comment[ca@valencia]=Escriu documents de presentació
 Comment[da]=Skriv præsentationsdokumenter
 Comment[de]=Präsentationsdokumente verfassen
 Comment[el]=Γράψτε έγγραφα παρουσιάσεων
 Comment[en_GB]=Write presentation documents
 Comment[es]=Escribir documentos de presentación
 Comment[et]=Esitlusdokumentide kirjutamine
 Comment[eu]=Aurkezpen-dokumentuak idatzi
 Comment[fi]=Kirjoita esitystiedostoja
 Comment[fr]=Écrire des documents de présentation
 Comment[gl]=Escriba e reproduza documentos de presentación.
 Comment[hu]=Prezentáció dokumentumok írása
 Comment[it]=Scrivi presentazioni
 Comment[ja]=プレゼンテーション文書を作成
 Comment[kk]=Презентация құжатын жазу
 Comment[ko]=프레젠테이션 문서 만들기
 Comment[mr]=प्रेझेंटेशन दस्तऐवज लिहा
 Comment[nb]=Skriv presentasjonsdokumenter
 Comment[nds]=Presentatschonen opstellen
 Comment[nl]=Presentatiedocumenten schrijven
 Comment[pl]=Pisz dokumenty prezentacji
 Comment[pt]=Escrever documentos de apresentações
 Comment[pt_BR]=Escrever documentos de apresentações
 Comment[ru]=Редактирование презентаций
 Comment[sk]=Písanie dokumentov prezentácií
 Comment[sl]=Pišite predstavitvene dokumente
 Comment[sv]=Skriv presentationsdokument
 Comment[tr]=Sunum belgeleri oluşturun
 Comment[ug]=سۇنۇلما پۈتۈكلىرىنى يېزىش پروگراممىسى
 Comment[uk]=Створення документів презентацій
 Comment[wa]=Sicrire documint di prezintaedje
 Comment[x-test]=xxWrite presentation documentsxx
 Comment[zh_CN]=编写演示文稿
 Comment[zh_TW]=撰寫簡報文件
 MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/x-kpresenter;application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.openxmlformats-officedocument.presentationml.template;
 X-KDE-ServiceTypes=Calligra/Application
 Icon=calligrastage
 X-KDE-NativeMimeType=application/vnd.oasis.opendocument.presentation
 X-Calligra-DefaultMimeTypes=application/vnd.oasis.opendocument.presentation,application/vnd.oasis.opendocument.presentation-template,application/x-kpresenter,application/vnd.ms-powerpoint,application/vnd.openxmlformats-officedocument.presentationml.presentation,application/vnd.openxmlformats-officedocument.presentationml.template
 X-DBUS-StartupType=multi
 X-DBUS-ServiceName=org.kde.calligrastage
-X-DocPath=stage/index.html
+X-DocPath=calligrastage/index.html
 X-KDE-StartupNotify=true
 Categories=Qt;KDE;Office;Presentation;