From 6d57630746a628a2ddf6cb469200b4b50b19ca73 Mon Sep 17 00:00:00 2001 From: Nick Bolton Date: Mon, 30 Jul 2018 12:27:35 +0100 Subject: [PATCH 1/2] Revert "#6375 Add missing headers needed for Qt 5.11" This reverts commit 85a8080339bfb0cd6fb0797f02beab9abd96025c. --- src/gui/src/ActionDialog.cpp | 1 - src/gui/src/ScreenSetupView.cpp | 1 - 2 files changed, 2 deletions(-) diff --git a/src/gui/src/ActionDialog.cpp b/src/gui/src/ActionDialog.cpp index 7518015e..94950338 100644 --- a/src/gui/src/ActionDialog.cpp +++ b/src/gui/src/ActionDialog.cpp @@ -25,7 +25,6 @@ #include #include -#include ActionDialog::ActionDialog(QWidget* parent, ServerConfig& config, Hotkey& hotkey, Action& action) : QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint), diff --git a/src/gui/src/ScreenSetupView.cpp b/src/gui/src/ScreenSetupView.cpp index 0580cf2d..f26d9700 100644 --- a/src/gui/src/ScreenSetupView.cpp +++ b/src/gui/src/ScreenSetupView.cpp @@ -22,7 +22,6 @@ #include #include -#include ScreenSetupView::ScreenSetupView(QWidget* parent) : QTableView(parent) From 7aa0553b570fd78d6d1abb4704e21ad1a78340b2 Mon Sep 17 00:00:00 2001 From: Nick Bolton Date: Mon, 30 Jul 2018 12:27:51 +0100 Subject: [PATCH 2/2] Revert "Merge pull request #6358 from jpwhiting/build_with_newer_cmake" This reverts commit 2b79608c4469044c88af0b19035a54b0b77570fd, reversing changes made to 183403ceb781d877a914f0d8fb4c688ba0b719b6. --- src/gui/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index a612afc2..bc8ba457 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -49,7 +49,7 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux") endif() endif() -target_link_libraries (synergy Qt5::Core Qt5::Widgets Qt5::Network) +qt5_use_modules (synergy Core Widgets Network) target_compile_definitions (synergy PRIVATE -DSYNERGY_VERSION_STAGE="${SYNERGY_VERSION_STAGE}") target_compile_definitions (synergy PRIVATE -DSYNERGY_REVISION="${SYNERGY_REVISION}")