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

List:       kde-commits
Subject:    [kruler] /: Use KDEFrameworkCompilerSettings
From:       Laurent Montel <null () kde ! org>
Date:       2018-09-20 6:55:54
Message-ID: E1g2ssU-0005W5-Sk () code ! kde ! org
[Download RAW message or body]

Git commit 491a1a31d897d49edf34c1d24c6cff309d6d7868 by Laurent Montel.
Committed on 20/09/2018 at 06:55.
Pushed by mlaurent into branch 'master'.

Use KDEFrameworkCompilerSettings

M  +1    -4    CMakeLists.txt
M  +1    -1    klineal.h

https://commits.kde.org/kruler/491a1a31d897d49edf34c1d24c6cff309d6d7868

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b4bd510..94a40c7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,7 @@ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
 add_definitions(-DTRANSLATION_DOMAIN="kruler")
 
 include(KDEInstallDirs)
-include(KDECompilerSettings NO_POLICY_SCOPE)
+include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
 include(KDECMakeSettings)
 include(ECMInstallIcons)
 include(FeatureSummary)
@@ -27,11 +27,8 @@ find_package(KF5 REQUIRED COMPONENTS
     WindowSystem
     XmlGui
 )
-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_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000)
 
 if (NOT APPLE)
diff --git a/klineal.h b/klineal.h
index efea641..69edcba 100644
--- a/klineal.h
+++ b/klineal.h
@@ -109,7 +109,7 @@ private:
   int length() const;
   QPoint localCursorPos() const;
 
-public slots:
+public Q_SLOTS:
   void rotate();
   void showMenu();
   void switchDirection();
[prev in list] [next in list] [prev in thread] [next in thread]