From 59c3670b63b6e97dac6115a0819e6c412d3f7888 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Wed, 15 Jun 2016 14:04:53 +0200
Subject: Make sure all private headers in Qt Core include qglobal_p.h

The rule was:
 - if the header included qglobal.h, turn that into qglobal_p.h
 - otherwise, insert the #include after the "We mean it" warning

qglobal_p.h currently only includes qglobal.h.

Change-Id: Ib056b47dde3341ef9a52ffff13ef677e471674b7
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 src/corelib/plugin/qelfparser_p.h     | 2 +-
 src/corelib/plugin/qlibrary_p.h       | 1 +
 src/corelib/plugin/qmachparser_p.h    | 2 +-
 src/corelib/plugin/qsystemlibrary_p.h | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/corelib/plugin')

diff --git a/src/corelib/plugin/qelfparser_p.h b/src/corelib/plugin/qelfparser_p.h
index 145f00df43..bcda19e8b5 100644
--- a/src/corelib/plugin/qelfparser_p.h
+++ b/src/corelib/plugin/qelfparser_p.h
@@ -52,7 +52,7 @@
 //
 
 #include <qendian.h>
-#include <qglobal.h>
+#include <private/qglobal_p.h>
 
 #ifndef QT_NO_LIBRARY
 #if defined (Q_OF_ELF) && defined(Q_CC_GNU)
diff --git a/src/corelib/plugin/qlibrary_p.h b/src/corelib/plugin/qlibrary_p.h
index c3bdc5a832..f883e74843 100644
--- a/src/corelib/plugin/qlibrary_p.h
+++ b/src/corelib/plugin/qlibrary_p.h
@@ -52,6 +52,7 @@
 // We mean it.
 //
 
+#include <QtCore/private/qglobal_p.h>
 #include "QtCore/qlibrary.h"
 #include "QtCore/qpointer.h"
 #include "QtCore/qstringlist.h"
diff --git a/src/corelib/plugin/qmachparser_p.h b/src/corelib/plugin/qmachparser_p.h
index 0df7a98f96..ff7eaadb70 100644
--- a/src/corelib/plugin/qmachparser_p.h
+++ b/src/corelib/plugin/qmachparser_p.h
@@ -52,7 +52,7 @@
 //
 
 #include <qendian.h>
-#include <qglobal.h>
+#include <private/qglobal_p.h>
 
 #ifndef QT_NO_LIBRARY
 #if defined(Q_OF_MACH_O)
diff --git a/src/corelib/plugin/qsystemlibrary_p.h b/src/corelib/plugin/qsystemlibrary_p.h
index 7b6d180df9..4e093c0b7c 100644
--- a/src/corelib/plugin/qsystemlibrary_p.h
+++ b/src/corelib/plugin/qsystemlibrary_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <QtCore/qglobal.h>
+#include <QtCore/private/qglobal_p.h>
 #ifdef Q_OS_WIN
 #  include <QtCore/qstring.h>
 #  include <qt_windows.h>
-- 
cgit v1.2.3