QtGui: Fix include convention

Use the module in qtx11extras_p.h, qguiapplication_p.h.

Pick-to: 6.1
Task-number: PYSIDE-1568
Change-Id: Iaf004d3fdad8472629d6f4d35031b517b3b735ce
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>

src/gui/kernel/qguiapplication_p.h

@@ -53,6 +53,7 @@
 
 #include <QtGui/private/qtguiglobal_p.h>
 #include <QtGui/qguiapplication.h>
+#include <QtGui/qicon.h>
 
 #include <QtCore/QPointF>
 #include <QtCore/QSharedPointer>
@@ -67,8 +68,6 @@
 #  include "private/qshortcutmap_p.h"
 #endif
 
-#include <qicon.h>
-
 QT_BEGIN_NAMESPACE
 
 class QColorTrcLut;

src/gui/platform/unix/qtx11extras_p.h

@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <qtguiglobal.h>
+#include <QtGui/qtguiglobal.h>
 
 #include <xcb/xcb.h>