diff --git a/CMakeLists.txt b/CMakeLists.txt
index 552c1eb..d5f0ed0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,54 +1,54 @@
 cmake_minimum_required(VERSION 3.0)
 
 set(KF5_VERSION "5.51.0") # handled by release scripts
 project(oxygen-icons VERSION ${KF5_VERSION})
 
 # ECM setup
 include(FeatureSummary)
 find_package(ECM 5.50.0  NO_MODULE)
 set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules")
 feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES)
 
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 
 include(KDEInstallDirs)
 include(KDECMakeSettings)
-include(KDECompilerSettings NO_POLICY_SCOPE)
+include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
 
 # Dependencies
 set(REQUIRED_QT_VERSION 5.8.0)
 
 set( oxygen_icon_dirs  8x8 16x16 22x22 32x32 48x48 64x64 128x128 256x256 )
 
 add_subdirectory(autotests)
 
 ########### install files ###############
 
 set(OXYGEN_INSTALL_DIR ${KDE_INSTALL_ICONDIR}/oxygen/base)
 install( DIRECTORY ${oxygen_icon_dirs} DESTINATION ${OXYGEN_INSTALL_DIR} PATTERN .svn EXCLUDE PATTERN "*.sh" EXCLUDE )
 install( FILES index.theme DESTINATION ${KDE_INSTALL_ICONDIR}/oxygen)
 
 macro (COPY_ICONS _srcdir _srcfile _destdir)
   set(_src "${_srcdir}/${_srcfile}")
   if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${_src}")
     foreach(_dest ${ARGN})
       install( FILES "${_src}" DESTINATION ${_destdir}/${_srcdir} RENAME "${_dest}" )
     endforeach()
   endif()
 endmacro (COPY_ICONS)
 
 # Copy the msoffice icon to the msoffice-2007 mimetypes (#225507)
 foreach(_sizedir ${oxygen_icon_dirs})
 
 #  template/example
 #  COPY_ICONS(
 #    ${_sizedir}/mimetypes
 #    application-msword.png
 #    ${OXYGEN_INSTALL_DIR}
 #    application-vnd.openxmlformats-officedocument.wordprocessingml.template.png
 #    application-vnd.ms-word.template.macroEnabled.12.png)
 
 endforeach()
 
 feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
 
diff --git a/autotests/testhelpers.h b/autotests/testhelpers.h
index b16dc46..c5240cc 100644
--- a/autotests/testhelpers.h
+++ b/autotests/testhelpers.h
@@ -1,57 +1,57 @@
 /*
     Copyright 2015-2016 Harald Sitter <sitter@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
     License as published by the Free Software Foundation; either
     version 2.1 of the License, or (at your option) version 3, or any
     later version accepted by the membership of KDE e.V. (or its
     successor approved by the membership of KDE e.V.), which shall
     act as a proxy defined in Section 6 of version 3 of the license.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Lesser General Public License for more details.
 
     You should have received a copy of the GNU Lesser General Public
     License along with this library. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef TESTHELPERS_H
 #define TESTHELPERS_H
 
 #include <QFileInfo>
 #include <QList>
 #include <QString>
 
 #include "testdata.h"
 
 #define _T_LIST_INDENT QStringLiteral("  ")
 #define _T_LIST_INDENT2 QStringLiteral("    ")
 
 void failListContent(const QList<QString> &list, const QString &header)
 {
     if (list.empty()) {
         return;
     }
     QString message = ("\n" + _T_LIST_INDENT + header);
     for (const auto path : list) {
         message += (_T_LIST_INDENT2 + "- " + path + "\n");
     }
-    QFAIL(message.toLatin1());
+    QFAIL(message.toLatin1().constData());
 }
 
 void failSymlinkList(const QList<QFileInfo> &list, const QString &header)
 {
     if (list.empty()) {
         return;
     }
     QString message = ("\n" + _T_LIST_INDENT + header);
     for (const auto info : list) {
         message += (_T_LIST_INDENT2 + info.filePath() + " => " + info.symLinkTarget() + "\n");
     }
-    QFAIL(message.toLatin1());
+    QFAIL(message.toLatin1().constData());
 }
 
 #endif // TESTHELPERS_H