From 1105361d80fa97f67f8da088119fbfffa7c0fd52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C4=83t=C4=83lin=20R=C4=83ceanu?=
 <catalinraceanu2@gmail.com>
Date: Sun, 24 Jun 2018 19:49:55 +0300
Subject: [PATCH] Use the correct include path for Qt headers

---
 src/common/utilscmn.cpp | 2 +-
 src/qt/apptraits.cpp    | 2 +-
 src/qt/clipbrd.cpp      | 4 ++--
 src/qt/cursor.cpp       | 4 ++--
 src/qt/dcscreen.cpp     | 4 ++--
 src/qt/listctrl.cpp     | 2 +-
 src/qt/toolbar.cpp      | 2 +-
 src/qt/uiaction.cpp     | 4 ++--
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index 6000660563..729c51da67 100644
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -108,7 +108,7 @@
 #endif
 
 #if wxUSE_GUI && defined(__WXQT__)
-    #include <QtGlobal>       // for QT_VERSION_STR constants
+    #include <QtCore/QtGlobal>       // for QT_VERSION_STR constants
 #endif
 #if wxUSE_BASE
 
diff --git a/src/qt/apptraits.cpp b/src/qt/apptraits.cpp
index f196158be2..1f1553f6c0 100644
--- a/src/qt/apptraits.cpp
+++ b/src/qt/apptraits.cpp
@@ -15,7 +15,7 @@
 #include "wx/timer.h"
 #include "wx/qt/private/timer.h"
 
-#include <QtGlobal>
+#include <QtCore/QtGlobal>
 
 wxEventLoopBase *wxGUIAppTraits::CreateEventLoop()
 {
diff --git a/src/qt/clipbrd.cpp b/src/qt/clipbrd.cpp
index d692f6627e..5a39a623c2 100644
--- a/src/qt/clipbrd.cpp
+++ b/src/qt/clipbrd.cpp
@@ -12,8 +12,8 @@
     #pragma hdrstop
 #endif
 
-#include <QApplication>
-#include <QClipboard>
+#include <QtWidgets/QApplication>
+#include <QtGui/QClipboard>
 
 #include "wx/clipbrd.h"
 #include "wx/scopedarray.h"
diff --git a/src/qt/cursor.cpp b/src/qt/cursor.cpp
index 442e250458..880a2799fa 100644
--- a/src/qt/cursor.cpp
+++ b/src/qt/cursor.cpp
@@ -12,8 +12,8 @@
     #pragma hdrstop
 #endif
 
-#include <QApplication>
-#include <QBitmap>
+#include <QtWidgets/QApplication>
+#include <QtGui/QBitmap>
 
 #ifndef WX_PRECOMP
     #include "wx/bitmap.h"
diff --git a/src/qt/dcscreen.cpp b/src/qt/dcscreen.cpp
index dd0e6f11b8..b42445ea3a 100644
--- a/src/qt/dcscreen.cpp
+++ b/src/qt/dcscreen.cpp
@@ -13,8 +13,8 @@
 
 #include <QtWidgets/QDesktopWidget>
 #include <QtGui/QScreen>
-#include <QApplication>
-#include <QPixmap>
+#include <QtWidgets/QApplication>
+#include <QtGui/QPixmap>
 
 wxIMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl, wxWindowDCImpl);
 
diff --git a/src/qt/listctrl.cpp b/src/qt/listctrl.cpp
index 7c9c9940cd..7ddd3b8d79 100644
--- a/src/qt/listctrl.cpp
+++ b/src/qt/listctrl.cpp
@@ -12,7 +12,7 @@
     #pragma hdrstop
 #endif
 
-#include <QHeaderView>
+#include <QtWidgets/QHeaderView>
 
 #ifndef WX_PRECOMP
     #include "wx/bitmap.h"
diff --git a/src/qt/toolbar.cpp b/src/qt/toolbar.cpp
index cad52f82cb..c6ec8adc5c 100644
--- a/src/qt/toolbar.cpp
+++ b/src/qt/toolbar.cpp
@@ -14,7 +14,7 @@
 
 #if wxUSE_TOOLBAR
 
-#include <QActionGroup>
+#include <QtWidgets/QActionGroup>
 #include <QtWidgets/QToolButton>
 
 #ifndef WX_PRECOMP
diff --git a/src/qt/uiaction.cpp b/src/qt/uiaction.cpp
index 6490cf35d9..0df9863b9c 100644
--- a/src/qt/uiaction.cpp
+++ b/src/qt/uiaction.cpp
@@ -16,8 +16,8 @@
 #include "wx/private/uiaction.h"
 
 #include <QtTest/QtTestGui>
-#include <QApplication>
-#include <QWidget>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QWidget>
 
 #include "wx/qt/defs.h"
 #include "wx/qt/private/utils.h"