From e3633d8a7b530d8a1dee52fa4495f9a3a352dfe9 Mon Sep 17 00:00:00 2001
From: Jeremy Whiting <jpwhiting@kde.org>
Date: Sun, 24 Jun 2018 10:22:21 -0600
Subject: [PATCH 1/2] Add missing header includes to build against Qt 5.11.0

Some Qt gui headers are no longer included when including QtGui
adding these two missing headers makes Synergy build here on windows.
---
 src/gui/src/ActionDialog.cpp    | 2 ++
 src/gui/src/ScreenSetupView.cpp | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/gui/src/ActionDialog.cpp b/src/gui/src/ActionDialog.cpp
index 94950338a..8c21cb8e3 100644
--- a/src/gui/src/ActionDialog.cpp
+++ b/src/gui/src/ActionDialog.cpp
@@ -26,6 +26,8 @@
 #include <QtCore>
 #include <QtGui>
 
+#include <QButtonGroup>
+
 ActionDialog::ActionDialog(QWidget* parent, ServerConfig& config, Hotkey& hotkey, Action& action) :
     QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint),
     Ui::ActionDialogBase(),
diff --git a/src/gui/src/ScreenSetupView.cpp b/src/gui/src/ScreenSetupView.cpp
index f26d97004..0f0f352ab 100644
--- a/src/gui/src/ScreenSetupView.cpp
+++ b/src/gui/src/ScreenSetupView.cpp
@@ -23,6 +23,8 @@
 #include <QtCore>
 #include <QtGui>
 
+#include <QHeaderView>
+
 ScreenSetupView::ScreenSetupView(QWidget* parent) :
     QTableView(parent)
 {

From eb620097c097d8e0c49be1e56ca5186c9cbe2858 Mon Sep 17 00:00:00 2001
From: Jamie Newbon <Jamie@symless.com>
Date: Tue, 30 Apr 2019 10:23:07 +0100
Subject: [PATCH 2/2] #6395 Removed direct Qt header includes

---
 src/gui/src/ActionDialog.cpp    | 2 --
 src/gui/src/ScreenSetupView.cpp | 2 --
 2 files changed, 4 deletions(-)

diff --git a/src/gui/src/ActionDialog.cpp b/src/gui/src/ActionDialog.cpp
index 9875b6ddb..7518015e3 100644
--- a/src/gui/src/ActionDialog.cpp
+++ b/src/gui/src/ActionDialog.cpp
@@ -25,8 +25,6 @@
 
 #include <QtCore>
 #include <QtGui>
-#include <qbuttongroup.h>
-
 #include <QButtonGroup>
 
 ActionDialog::ActionDialog(QWidget* parent, ServerConfig& config, Hotkey& hotkey, Action& action) :
diff --git a/src/gui/src/ScreenSetupView.cpp b/src/gui/src/ScreenSetupView.cpp
index b8a901a70..0580cf2de 100644
--- a/src/gui/src/ScreenSetupView.cpp
+++ b/src/gui/src/ScreenSetupView.cpp
@@ -22,8 +22,6 @@
 
 #include <QtCore>
 #include <QtGui>
-#include <qheaderview.h>
-
 #include <QHeaderView>
 
 ScreenSetupView::ScreenSetupView(QWidget* parent) :