diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7f75460b..a818cc1c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,49 +1,52 @@
 cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
 find_package(ECM 1.8.0 REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
 include(SetKReportCMakePolicies NO_POLICY_SCOPE)
 
 project(KReport VERSION 3.0.90) # Update this
 
-include(ECMPackageConfigHelpers)
+# CMake
+include(CMakePackageConfigHelpers)
+
+# ECM
 include(ECMGeneratePriFile)
 include(ECMPoQmTools)
 include(ECMSetupVersion)
 include(ECMInstallIcons)
 include(ECMOptionalAddSubdirectory)
-
 include(KDEInstallDirs)
-include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
-include(KDECMakeSettings NO_POLICY_SCOPE)
+include(KDECMakeSettings)
+include(KDEFrameworkCompilerSettings)
 
-include(KReportMacros)
+# Own
 include(KReportAddIconsRccFile)
 include(KReportAddQCH)
+include(KReportMacros)
 
 simple_option(BUILD_QCH "Build API documentation in QCH format" OFF)
 
 # Dependencies
 set(REQUIRED_QT_VERSION "5.3.0")
 set(REQUIRED_KF5_VERSION 5.7.0)
 set(REQUIRED_KPROPERTY_VERSION 3.0.90)
 
 # Required components to build this framework
 # TODO move Widgets/KF5WidgetsAddons-dependent part to a libKReportDesigner
 find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Core Widgets Xml PrintSupport)
 find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED CoreAddons WidgetsAddons GuiAddons Config)
 find_package(KPropertyWidgets ${REQUIRED_KPROPERTY_VERSION} REQUIRED COMPONENTS KF)
 
 get_git_revision_and_branch()
 add_tests()
 add_examples()
 add_unfinished_features_option()
 add_pc_file(${PROJECT_NAME})
 
 add_subdirectory(src)
 
 if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
     ecm_install_po_files_as_qm(po)
 endif()
 
 feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
 macro_display_feature_log()
diff --git a/cmake/modules/SetKReportCMakePolicies.cmake b/cmake/modules/SetKReportCMakePolicies.cmake
index 7a8444e6..c2f712d9 100644
--- a/cmake/modules/SetKReportCMakePolicies.cmake
+++ b/cmake/modules/SetKReportCMakePolicies.cmake
@@ -1,16 +1,18 @@
 # Copyright (C) 2003-2016 Jarosław Staniek <staniek@kde.org>
 #
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
 cmake_policy(SET CMP0002 OLD)
 cmake_policy(SET CMP0017 NEW)
 cmake_policy(SET CMP0022 OLD)
 cmake_policy(SET CMP0048 NEW) # for PROJECT_VERSION
+cmake_policy(SET CMP0053 NEW) # TODO remove, temporary fix for a bug in Qt 5.8's Qt5ModuleLocation.cmake
+                              # "Simplify variable reference and escape sequence evaluation"
 
 if(POLICY CMP0059) # Don’t treat DEFINITIONS as a built-in directory property.
     cmake_policy(SET CMP0059 OLD)
 endif()
 if(POLICY CMP0063) # Honor visibility properties for all target types (since cmake 3.3)
     cmake_policy(SET CMP0063 NEW)
 endif()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7b5d1bbe..1e01f598 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,374 +1,374 @@
 # Options
 simple_option(KREPORT_SCRIPTING "Scripting support using JavaScript language" ON)
 
 if(KREPORT_SCRIPTING)
     find_package(Qt5Qml REQUIRED)
     set(SCRIPTING_LIBS Qt5::Qml)
 endif()
 
 set(kreport_LIB_SRCS
     common/kreport_debug.cpp
     common/kreportplugin_debug.cpp
     common/KReportItemBase.cpp
     common/KReportAsyncItemBase.cpp
     common/KReportSectionData.cpp
     common/KReportLabelSizeInfo.cpp
     common/KReportDocument.cpp
     common/KReportDetailSectionData.cpp
     common/KReportPluginInterface.cpp
     common/KReportItemLine.cpp
     common/KReportRenderObjects.cpp
     common/KReportPluginManager.cpp
     common/KReportJsonTrader_p.cpp
     common/KReportPluginMetaData.cpp
     common/KReportDataSource.cpp
     common/KReportUtils.cpp
     common/KReportPageSize.cpp
     common/KReportUnit.cpp
     common/KReportDesign.cpp
     common/KReportDesign_p.cpp
     common/KReportLineStyle.cpp
     common/KReportElement.cpp
     ${PROJECT_BINARY_DIR}/src/KReportElement_sdc.cpp
     common/KReportSection.cpp
 
     renderer/KReportPrintRenderer_p.cpp
     renderer/KReportPreRenderer.cpp
     renderer/KReportAsyncItemManager_p.cpp
     renderer/KReportScreenRenderer_p.cpp
     renderer/KReportHTMLTableRenderer_p.cpp
     renderer/KReportHTMLCSSRenderer_p.cpp
     #TODO renderer/KReportKSpreadRenderer.cpp
     #TODO renderer/KReportODTRenderer.cpp
     #TODO renderer/KOdtFrameReportRenderer.cpp
     renderer/KReportRendererBase.cpp
     renderer/KReportPage.cpp
     renderer/KReportView.cpp
     renderer/KReportOneRecordDataSource_p.cpp
 
     wrtembed/KReportDetailGroupSectionDialog.cpp
     wrtembed/KReportDesignerItemBase.cpp
     wrtembed/KReportDesignerItemRectBase.cpp
     wrtembed/KReportDesignerItemLine.cpp
     wrtembed/KReportDesignerSection.cpp
     wrtembed/KReportDesignerSectionDetailGroup.cpp
     wrtembed/KReportDesignerSectionDetail.cpp
     wrtembed/KReportDesignerSectionScene.cpp
     wrtembed/KReportDesignerSectionView.cpp
     wrtembed/KReportDesigner.cpp
     wrtembed/KReportPropertiesButton.cpp
     wrtembed/KReportSectionEditor.cpp
     wrtembed/KReportRuler.cpp
     wrtembed/KReportZoomHandler.cpp
     wrtembed/KReportZoomMode.cpp
 
     items/label/KReportItemLabel.cpp
     items/label/KReportDesignerItemLabel.cpp
     items/label/KReportLabelPlugin.cpp
     items/label/KReportBoundedTextItem.cpp
     items/label/KReportLabelElement.cpp
     items/label/label.json
 
     items/check/KReportItemCheck.cpp
     items/check/KReportDesignerItemCheckBox.cpp
     items/check/KReportCheckBoxPlugin.cpp
     items/check/check.json
 
     items/field/KReportItemField.cpp
     items/field/KReportDesignerItemField.cpp
     items/field/KReportFieldPlugin.cpp
     items/field/field.json
 
     items/image/KReportItemImage.cpp
     items/image/KReportDesignerItemImage.cpp
     items/image/KReportImagePlugin.cpp
     items/image/image.json
 
     items/text/KReportItemText.cpp
     items/text/KReportDesignerItemText.cpp
     items/text/KReportTextPlugin.cpp
     items/text/text.json
 
     # non-source:
     Mainpage.dox
     Messages.sh
 )
        
 set(kreport_INCLUDE_DIRS
     ${CMAKE_CURRENT_SOURCE_DIR}/common
     ${CMAKE_CURRENT_SOURCE_DIR}/wrtembed
     ${CMAKE_CURRENT_SOURCE_DIR}/renderer
 )
 
 set(kreport_TARGET_INCLUDE_DIRS
     common renderer wrtembed
 )
 
 if(KREPORT_SCRIPTING)
     list(APPEND kreport_LIB_SRCS
         renderer/scripting/KReportScriptHandler.cpp
         renderer/scripting/KReportScriptConstants.cpp
         renderer/scripting/KReportScriptDebug.cpp
         renderer/scripting/KReportScriptDraw.cpp
         renderer/scripting/KReportScriptReport.cpp
         renderer/scripting/KReportScriptSection.cpp
         renderer/scripting/KReportScriptLine.cpp
 
         #renderer/odtframe/KoOdtFrameReportDocument.cpp
         #renderer/odtframe/KoOdtFrameReportCheckBox.cpp
         #renderer/odtframe/KoOdtFrameReportImage.cpp
         #renderer/odtframe/KoOdtFrameReportTextBox.cpp
         #renderer/odtframe/KoOdtFrameReportLine.cpp
         #renderer/odtframe/KoOdtFrameReportPicture.cpp
         #renderer/odtframe/KoOdtFrameReportPrimitive.cpp
 
         #renderer/ods/KoSimpleOdsDocument.cpp
         #renderer/ods/KoSimpleOdsSheet.cpp
         #renderer/ods/KoSimpleOdsCell.cpp
 
         items/label/KReportScriptLabel.cpp
         items/check/KReportScriptCheck.cpp
         items/field/KReportScriptField.cpp
         items/image/KReportScriptImage.cpp
         items/text/KReportScriptText.cpp
     )
 
     qt_wrap_cpp(KReport kreport_LIB_SRCS
         renderer/scripting/KReportGroupTracker.h
     )
 
     list(APPEND kreport_INCLUDE_DIRS
         ${CMAKE_CURRENT_SOURCE_DIR}/renderer/scripting
     )
 
     list(APPEND kreport_TARGET_INCLUDE_DIRS
         renderer/scripting
     )
 endif()
 
 qt5_wrap_ui(kreport_LIB_SRCS
     wrtembed/KReportDetailGroupSectionDialog.ui
     wrtembed/KReportSectionEditor.ui
 )
 
 ecm_create_qm_loader(kreport_LIB_SRCS kreport_qt)
 
 add_library(KReport SHARED ${kreport_LIB_SRCS})
 set_coinstallable_lib_version(KReport)
 
 add_library(KReportUtilsPrivate STATIC
     common/KReportUtils_p.cpp
 )
     
 kdb_create_shared_data_classes(
     kreport_GENERATED_SHARED_DATA_CLASS_HEADERS # output variable with list of headers
     NO_PREFIX # subdirectory in which the headers should be generated
     common/KReportLineStyle.shared.h
     common/KReportElement.shared.h
     common/KReportSection.shared.h
     items/label/KReportLabelElement.shared.h
 )
 
 kdb_remove_extensions(
     kreport_GENERATED_SHARED_DATA_CLASS_BASENAMES
     ${kreport_GENERATED_SHARED_DATA_CLASS_HEADERS}
 )
 
 generate_export_header(KReport)
 
 #qt5_use_modules(KReport Widgets Xml PrintSupport)
 
 target_include_directories(KReport
     PUBLIC "$<BUILD_INTERFACE:${kreport_INCLUDE_DIRS}>"
     INTERFACE "$<INSTALL_INTERFACE:${KREPORT_INCLUDE_INSTALL_DIR}>"
     PRIVATE ${kreport_TARGET_INCLUDE_DIRS}
 )
 
 target_link_libraries(KReport
     PUBLIC
         Qt5::PrintSupport
         Qt5::Xml
         KF5::CoreAddons
         KPropertyWidgets
     PRIVATE
         ${SCRIPTING_LIBS}
         KReportUtilsPrivate
 )
 
 target_link_libraries(KReportUtilsPrivate
     PUBLIC
         Qt5::Widgets
     PRIVATE
         KF5::WidgetsAddons
         KF5::ConfigGui 
     )
     
 ecm_setup_version(${PROJECT_VERSION}
     VARIABLE_PREFIX KREPORT
     VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kreport_version.h"
     PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KReportConfigVersion.cmake"
 )
 
 install(TARGETS KReport
         EXPORT KReportTargets
         ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 
 # Create a Config.cmake and a ConfigVersion.cmake file and install them
 set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/${KREPORT_BASE_NAME}")
 
 # A place for KReport plugins
 set(KREPORT_PLUGIN_INSTALL_DIR ${PLUGIN_INSTALL_DIR}/kreport${PROJECT_STABLE_VERSION_MAJOR})
 
-ecm_configure_package_config_file(
+configure_package_config_file(
     "${CMAKE_CURRENT_SOURCE_DIR}/KReportConfig.cmake.in"
     "${CMAKE_CURRENT_BINARY_DIR}/KReportConfig.cmake"
     INSTALL_DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
 )
 
 install(FILES
         "${CMAKE_CURRENT_BINARY_DIR}/KReportConfig.cmake"
         "${CMAKE_CURRENT_BINARY_DIR}/KReportConfigVersion.cmake"
         DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
         COMPONENT Devel)
 
 install(EXPORT KReportTargets
         DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
         FILE KReportTargets.cmake)
 
 ecm_generate_pri_file(
     BASE_NAME ${KREPORT_BASE_NAME}
     LIB_NAME ${KREPORT_BASE_NAME}
     DEPS "widgets"
     FILENAME_VAR PRI_FILENAME
     INCLUDE_INSTALL_DIR ${KREPORT_INCLUDE_INSTALL_DIR}
 )
 
 install(FILES ${PRI_FILENAME}
         DESTINATION ${ECM_MKSPECS_INSTALL_DIR})
 
 install(FILES kreport_elementplugin.desktop  DESTINATION ${SERVICETYPES_INSTALL_DIR})
 
 ecm_generate_headers(kreport_FORWARDING_HEADERS
     REQUIRED_HEADERS kreport_HEADERS
     ORIGINAL CAMELCASE
     RELATIVE common
     HEADER_NAMES
         KReportPageSize
         KReportDataSource
         KReportItemBase
         KReportItemLine
         KReportPluginMetaData
         KReportPluginManager
         KReportPluginInterface
         KReportUnit
         KReportUtils
         KReportDesign
         KReportDocument
         KReportSectionData
         KReportRenderObjects
         KReportAsyncItemBase
 )
 
 ecm_generate_headers(kreport_FORWARDING_HEADERS
     REQUIRED_HEADERS kreport_HEADERS
     ORIGINAL CAMELCASE
     RELATIVE renderer
     HEADER_NAMES
         KReportPage
         KReportRendererBase
         KReportPreRenderer
         KReportView
 )
 
 if(KREPORT_SCRIPTING)
     ecm_generate_headers(kreport_FORWARDING_HEADERS
         REQUIRED_HEADERS kreport_HEADERS
         ORIGINAL CAMELCASE
         RELATIVE renderer/scripting
         HEADER_NAMES
             KReportScriptHandler
             KReportScriptDraw
             KReportScriptConstants
             KReportGroupTracker
     )
 endif()
 
 ecm_generate_headers(kreport_FORWARDING_HEADERS
     REQUIRED_HEADERS kreport_HEADERS
     ORIGINAL CAMELCASE
     RELATIVE wrtembed
     HEADER_NAMES
         KReportZoomMode
         KReportDesignerSectionDetail
         KReportDesignerSection
         KReportZoomHandler
         KReportDesignerItemBase
         KReportDesignerSectionDetailGroup
         KReportDesignerItemRectBase
         KReportDesigner
 )
 
 ecm_generate_headers(kreport_FORWARDING_HEADERS_FROM_BUILDDIR
     REQUIRED_HEADERS kreport_HEADERS_FROM_BUILDDIR
     ORIGINAL CAMELCASE
     SOURCE_DIR ${PROJECT_BINARY_DIR}/src
     HEADER_NAMES
         ${kreport_GENERATED_SHARED_DATA_CLASS_BASENAMES}
 )
 
 list(APPEND kreport_HEADERS ${CMAKE_CURRENT_BINARY_DIR}/kreport_version.h)
 
 install(
     FILES
         ${kreport_HEADERS}
         ${kreport_HEADERS_FROM_BUILDDIR}
         ${kreport_FORWARDING_HEADERS}
         ${kreport_FORWARDING_HEADERS_FROM_BUILDDIR}
         ${PROJECT_BINARY_DIR}/src/kreport_export.h
         ${PROJECT_BINARY_DIR}/src/config-kreport.h
     DESTINATION ${KREPORT_INCLUDE_INSTALL_DIR}
     COMPONENT Devel
 )
 
 if(BUILD_QCH)
     kreport_add_qch(
         KReport_QCH
         NAME KReport
         BASE_NAME ${KREPORT_BASE_NAME}
         VERSION ${PROJECT_VERSION}
         NAMESPACE org.kde.${KREPORT_BASE_NAME}
         SOURCES
             Mainpage.dox
             ${kreport_HEADERS}
             ${kreport_HEADERS_FROM_BUILDDIR}
         LINK_QCHS
             Qt5Core_QCH
             Qt5Xml_QCH
             Qt5Gui_QCH
             Qt5Widgets_QCH
             Qt5PrintSupport_QCH
             KF5CoreAddons_QCH
             KPropertyCore_QCH
             KPropertyWidgets_QCH
         BLANK_MACROS
             KREPORT_EXPORT
             KREPORT_DEPRECATED
         TAGFILE_INSTALL_DESTINATION ${KREPORT_QTQCH_FULL_INSTALL_DIR}
         QCH_INSTALL_DESTINATION ${KREPORT_QTQCH_FULL_INSTALL_DIR}
     )
     set(kreport_qch_targets KReport_QCH)
 endif()
 
 kreport_install_qch_export(
     TARGETS ${kreport_qch_targets}
     FILE KReportQCHTargets.cmake
     DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
     COMPONENT Devel
 )
 
 add_subdirectory(plugins)
 add_subdirectory(pics)
 
 enable_testing()
 
 configure_file(config-kreport.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kreport.h)
diff --git a/src/KReportConfig.cmake.in b/src/KReportConfig.cmake.in
index 30d97263..6b6bf3b5 100644
--- a/src/KReportConfig.cmake.in
+++ b/src/KReportConfig.cmake.in
@@ -1,28 +1,32 @@
 # KReportConfig.cmake provides information about the installed KReport library.
 # It can be used directly from CMake via find_package(KReport NO_MODULE)
 #
+# Any changes in this ".cmake" file will be overwritten by CMake, the source is the ".cmake.in" file.
+#
 # The following CMake variables are provided:
 #   KReport_VERSION_MAJOR - the major version number of KReport
 #   KReport_VERSION_MINOR - the minor version number of KReport
 #   KReport_VERSION_PATCH - the patch version number of KReport
 #   KReport_INCLUDE_DIRS  - the include directories to use
 #
 # Additionally, the following imported library targets are created, which may be used directly
 # with target_link_libraries():
 #   KReport - the KReport library
 
 @PACKAGE_INIT@
 
+include(CMakeFindDependencyMacro)
+
 find_dependency(Qt5Core @REQUIRED_QT_VERSION@ REQUIRED)
 find_dependency(Qt5Widgets @REQUIRED_QT_VERSION@ REQUIRED)
 find_dependency(Qt5Xml @REQUIRED_QT_VERSION@ REQUIRED)
 find_dependency(KPropertyWidgets @REQUIRED_KPROPERTY_VERSION@)
 
 include("${CMAKE_CURRENT_LIST_DIR}/KReportTargets.cmake")
 include("${CMAKE_CURRENT_LIST_DIR}/KReportQCHTargets.cmake")
 
 # "public" variables:
 
 set(KREPORT_SCRIPTING @KREPORT_SCRIPTING@)
 
 # TODO