From 2b7cf045bfbfa5d379698fdc18a3d200487a9457 Mon Sep 17 00:00:00 2001
From: Alexandru Croitor <alexandru.croitor@qt.io>
Date: Mon, 30 Oct 2017 15:27:57 +0100
Subject: [PATCH] Replace <QtCore/QtConfig> includes with qglobal.h

Nothing (except the *global*.h headers themselves) is supposed to include
the generated *config*.h files directly. The QtConfig forwarding header
should not exist in the first place.

Change-Id: I5e9edd25d905582381cdc6386804c1f3ef8716ae
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
 src/plugins/platforms/windows/accessible/iaccessible2.cpp      | 2 +-
 src/plugins/platforms/windows/accessible/iaccessible2.h        | 2 +-
 .../platforms/windows/accessible/qwindowsaccessibility.cpp     | 2 +-
 .../platforms/windows/accessible/qwindowsmsaaaccessible.cpp    | 2 +-
 .../platforms/windows/accessible/qwindowsmsaaaccessible.h      | 3 +--
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/plugins/platforms/windows/accessible/iaccessible2.cpp b/src/plugins/platforms/windows/accessible/iaccessible2.cpp
index 9239facb0c..75af65b5ab 100644
--- a/src/plugins/platforms/windows/accessible/iaccessible2.cpp
+++ b/src/plugins/platforms/windows/accessible/iaccessible2.cpp
@@ -36,7 +36,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include <QtCore/QtConfig>
+#include <QtCore/qglobal.h>
 #ifndef QT_NO_ACCESSIBILITY
 
 #include "iaccessible2.h"
diff --git a/src/plugins/platforms/windows/accessible/iaccessible2.h b/src/plugins/platforms/windows/accessible/iaccessible2.h
index e56106f247..d987016e15 100644
--- a/src/plugins/platforms/windows/accessible/iaccessible2.h
+++ b/src/plugins/platforms/windows/accessible/iaccessible2.h
@@ -39,7 +39,7 @@
 #ifndef IACCESSIBLE2_H
 #define IACCESSIBLE2_H
 
-#include <QtCore/QtConfig>
+#include <QtCore/qglobal.h>
 #ifndef QT_NO_ACCESSIBILITY
 
 #include "qwindowscombase.h"
diff --git a/src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp b/src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp
index e214d47137..d48cb9674f 100644
--- a/src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp
+++ b/src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include <QtCore/QtConfig>
+#include <QtCore/qglobal.h>
 #ifndef QT_NO_ACCESSIBILITY
 
 
diff --git a/src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.cpp b/src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.cpp
index 47b179250a..fe2b9335cb 100644
--- a/src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.cpp
+++ b/src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include <QtCore/QtConfig>
+#include <QtCore/qglobal.h>
 #ifndef QT_NO_ACCESSIBILITY
 
 #include "qwindowsmsaaaccessible.h"
diff --git a/src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.h b/src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.h
index e654f262da..5380fc2411 100644
--- a/src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.h
+++ b/src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.h
@@ -39,9 +39,8 @@
 #ifndef QWINDOWSMSAAACCESSIBLE_H
 #define QWINDOWSMSAAACCESSIBLE_H
 
-#include <QtCore/QtConfig>
-#ifndef QT_NO_ACCESSIBILITY
 #include <QtCore/qglobal.h>
+#ifndef QT_NO_ACCESSIBILITY
 
 #include <QtCore/qt_windows.h>
 #include <QtCore/qsharedpointer.h>