From 37b742b0c53b61d679c6e43d4e95aaf94b76acf4 Mon Sep 17 00:00:00 2001 From: "Friedrich W. H. Kossebau" Date: Sat, 10 Mar 2018 01:23:47 +0100 Subject: [PATCH] Clear QT_DISABLE_DEPRECATED_BEFORE from KDELibs4Support before setting it --- statusnotifierwatcher/CMakeLists.txt | 2 ++ systemmonitor/CMakeLists.txt | 2 ++ 2 files changed, 4 insertions(+) diff --git a/statusnotifierwatcher/CMakeLists.txt b/statusnotifierwatcher/CMakeLists.txt index 3a420ea40..b5f5eb523 100644 --- a/statusnotifierwatcher/CMakeLists.txt +++ b/statusnotifierwatcher/CMakeLists.txt @@ -1,4 +1,6 @@ add_definitions("-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII") +# clear setting pulled in from finding KF5::KDELibs4Support before resetting +remove_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0) add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000) add_definitions(-DQT_NO_URL_CAST_FROM_STRING) diff --git a/systemmonitor/CMakeLists.txt b/systemmonitor/CMakeLists.txt index c1c55d58f..b4b6038c3 100644 --- a/systemmonitor/CMakeLists.txt +++ b/systemmonitor/CMakeLists.txt @@ -1,6 +1,8 @@ add_definitions(-DTRANSLATION_DOMAIN=\"systemmonitor\") add_definitions("-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII") +# clear setting pulled in from finding KF5::KDELibs4Support before resetting +remove_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0) add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000) add_definitions(-DQT_NO_URL_CAST_FROM_STRING)