From a536e074882f51c73172150679b7e37a889f5a3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Thu, 29 Aug 2013 16:22:30 +0200 Subject: [PATCH] Use kdeqt5staging for QCommandLineParser Makes it also compile with not latest Qt. --- CMakeLists.txt | 1 + killer/CMakeLists.txt | 1 + killer/killer.cpp | 2 +- main.cpp | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6b061e298c..230964577e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -231,6 +231,7 @@ set(kwin_QT_LIBS set(kwin_KDE_LIBS ${KDE4Support_LIBRARIES} ${KDECLARATIVE_LIBRARIES} + kdeqt5staging # TODO: remove once QCommandLineParser is dropped KF5::KConfigCore KF5::KCoreAddons KF5::KCrash diff --git a/killer/CMakeLists.txt b/killer/CMakeLists.txt index 8073fc9247..f52f102117 100644 --- a/killer/CMakeLists.txt +++ b/killer/CMakeLists.txt @@ -13,6 +13,7 @@ target_link_libraries(kwin_killer_helper KF5::KAuth KF5::KI18n KF5::KWidgetsAddons + kdeqt5staging # TODO: remove once QCommandLineParser is dropped ) install(TARGETS kwin_killer_helper DESTINATION ${LIBEXEC_INSTALL_DIR} ) diff --git a/killer/killer.cpp b/killer/killer.cpp index 5d17ce87d5..62543fe927 100644 --- a/killer/killer.cpp +++ b/killer/killer.cpp @@ -26,7 +26,7 @@ DEALINGS IN THE SOFTWARE. #include #include #include -#include +#include #include #include #include diff --git a/main.cpp b/main.cpp index 2dcc7eaa3c..183e5e5939 100644 --- a/main.cpp +++ b/main.cpp @@ -43,7 +43,7 @@ along with this program. If not, see . // Qt #include #include -#include +#include #include #include #include