[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kscreenlocker] /: Use KDEFrameworkCompilerSettings
From:       Laurent Montel <null () kde ! org>
Date:       2018-09-20 5:04:00
Message-ID: E1g2r8C-00049z-Aa () code ! kde ! org
[Download RAW message or body]

Git commit 7984b46a967139ef4f32302b7d20cd86b7129639 by Laurent Montel.
Committed on 20/09/2018 at 05:03.
Pushed by mlaurent into branch 'master'.

Use KDEFrameworkCompilerSettings

M  +1    -5    CMakeLists.txt
M  +1    -1    kcm/kcm.h

https://commits.kde.org/kscreenlocker/7984b46a967139ef4f32302b7d20cd86b7129639

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 653ad74..402d923 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,7 +12,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${ECM_MODULE_PATH} ${ECM
 
 include(KDEInstallDirs)
 include(KDECMakeSettings)
-include(KDECompilerSettings NO_POLICY_SCOPE)
+include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
 include(ECMSetupVersion)
 include(ECMGenerateHeaders)
 include(CheckIncludeFiles)
@@ -145,11 +145,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 set(KSLD_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}/KScreenLocker")
 
-add_definitions(-DQT_NO_CAST_FROM_ASCII)
-add_definitions(-DQT_NO_CAST_TO_ASCII)
 add_definitions(-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT)
-add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
-add_definitions(-DQT_USE_QSTRINGBUILDER)
 
 add_subdirectory(kcheckpass)
 add_subdirectory(greeter)
diff --git a/kcm/kcm.h b/kcm/kcm.h
index 5d0709b..cf01195 100644
--- a/kcm/kcm.h
+++ b/kcm/kcm.h
@@ -106,7 +106,7 @@ public:
         return q->currentWallpaper();
     }
 
-signals:
+Q_SIGNALS:
     void wallpaperConfigurationChanged();
     void currentWallpaperChanged();
 
[prev in list] [next in list] [prev in thread] [next in thread]