From f9b83f9516e64d9a330510f81f3d7c7eae06ef6d Mon Sep 17 00:00:00 2001 From: Jeremy Whiting Date: Sun, 24 Jun 2018 00:31:29 -0600 Subject: [PATCH 1/2] Use target_link_libraries instead of qt5_use_modules. Since qt5_use_modules is deprecated in newer cmake versions use target_link_libraries with Qt5:: targets instead. see: http://doc.qt.io/qt-5/cmake-manual.html --- 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 bc8ba457..a612afc2 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -49,7 +49,7 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux") endif() endif() -qt5_use_modules (synergy Core Widgets Network) +target_link_libraries (synergy Qt5::Core Qt5::Widgets Qt5::Network) target_compile_definitions (synergy PRIVATE -DSYNERGY_VERSION_STAGE="${SYNERGY_VERSION_STAGE}") target_compile_definitions (synergy PRIVATE -DSYNERGY_REVISION="${SYNERGY_REVISION}") From 85a8080339bfb0cd6fb0797f02beab9abd96025c Mon Sep 17 00:00:00 2001 From: Nick Bolton Date: Sun, 29 Jul 2018 18:04:36 +0100 Subject: [PATCH 2/2] #6375 Add missing headers needed for Qt 5.11 --- src/gui/src/ActionDialog.cpp | 1 + src/gui/src/ScreenSetupView.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/src/gui/src/ActionDialog.cpp b/src/gui/src/ActionDialog.cpp index 94950338..7518015e 100644 --- a/src/gui/src/ActionDialog.cpp +++ b/src/gui/src/ActionDialog.cpp @@ -25,6 +25,7 @@ #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 f26d9700..0580cf2d 100644 --- a/src/gui/src/ScreenSetupView.cpp +++ b/src/gui/src/ScreenSetupView.cpp @@ -22,6 +22,7 @@ #include #include +#include ScreenSetupView::ScreenSetupView(QWidget* parent) : QTableView(parent)