From 70cc0885f9e790dda16f2655e8c524179c3c6202 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Mon, 31 May 2021 14:56:13 +0200
Subject: [PATCH] QtGui: Fix include convention
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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    | 3 +--
 src/gui/platform/unix/qtx11extras_p.h | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/gui/kernel/qguiapplication_p.h b/src/gui/kernel/qguiapplication_p.h
index f6c8693206..70571cf751 100644
--- a/src/gui/kernel/qguiapplication_p.h
+++ b/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;
diff --git a/src/gui/platform/unix/qtx11extras_p.h b/src/gui/platform/unix/qtx11extras_p.h
index 85b26b1462..aed46a82b4 100644
--- a/src/gui/platform/unix/qtx11extras_p.h
+++ b/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>