Make sure all qtbase private headers include at least one other

See script in qtbase/util/includeprivate for the rules.

Since these files are being touched anyway, I also ran the
updatecopyright.pl script too.

Change-Id: Ib056b47dde3341ef9a52ffff13ef677e471674b6
Reviewed-by: Marc Mutz <marc.mutz@qt.io>

src/corelib/global/qendian_p.h

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
@@ -52,6 +52,7 @@
 //
 
 #include <QtCore/qendian.h>
+#include <QtCore/private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/corelib/global/qlibraryinfo_p.h

@@ -53,6 +53,7 @@
 //
 
 #include "QtCore/qlibraryinfo.h"
+#include "QtCore/private/qglobal_p.h"
 
 #if QT_CONFIG(settings)
 #    include "QtCore/qsettings.h"

src/corelib/global/qlogging_p.h

@@ -51,6 +51,8 @@
 // We mean it.
 //
 
+#include <QtCore/private/qglobal_p.h>
+
 QT_BEGIN_NAMESPACE
 
 namespace QtPrivate {

src/corelib/global/qnativeinterface_p.h

@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <QtCore/qglobal.h>
+#include <QtCore/private/qglobal_p.h>
 #include <QtCore/qloggingcategory.h>
 
 QT_BEGIN_NAMESPACE

src/corelib/global/qoperatingsystemversion_p.h

@@ -52,6 +52,7 @@
 //
 
 #include "qoperatingsystemversion.h"
+#include "private/qglobal_p.h"
 
 #ifdef Q_OS_WIN
 #include <qt_windows.h>

src/corelib/global/qoperatingsystemversion_win_p.h

@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <QtCore/qglobal.h>
+#include <QtCore/private/qglobal_p.h>
 #include <qt_windows.h>
 
 QT_BEGIN_NAMESPACE

src/corelib/global/qtrace_p.h

@@ -116,7 +116,7 @@
  * qcoreapplication_baz above.
  */
 
-#include <QtCore/qglobal.h>
+#include <QtCore/private/qglobal_p.h>
 #include <QtCore/qscopeguard.h>
 
 QT_BEGIN_NAMESPACE

src/corelib/global/qvolatile_p.h

@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <QtCore/qglobal.h>
+#include <QtCore/private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/corelib/io/qntdll_p.h

@@ -51,6 +51,8 @@
 // We mean it.
 //
 
+#include <QtCore/private/qglobal_p.h>
+
 #include <winternl.h>
 
 QT_BEGIN_NAMESPACE

src/corelib/kernel/qdeadlinetimer_p.h

@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <QtCore/qglobal.h>
+#include <QtCore/private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/corelib/kernel/qfunctions_winrt_p.h

@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <QtCore/qglobal.h>
+#include <QtCore/private/qglobal_p.h>
 
 #if defined(Q_OS_WIN) && defined(Q_CC_MSVC)
 

src/corelib/kernel/qiterable_p.h

@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <QtCore/qglobal.h>
+#include <QtCore/private/qglobal_p.h>
 #include <QtCore/qvariant.h>
 
 QT_BEGIN_NAMESPACE

src/corelib/kernel/qmetaobject_moc_p.h

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
@@ -53,6 +53,7 @@
 //
 
 #include <QtCore/qbytearray.h>
+#include <QtCore/private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/corelib/kernel/qpoll_p.h

@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <QtCore/qglobal.h>
+#include <QtCore/private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/corelib/kernel/qproperty_p.h

@@ -1,6 +1,6 @@
 /***************************************************************************
 **
-** Copyright (C) 2020 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <qglobal.h>
+#include <private/qglobal_p.h>
 #include <qproperty.h>
 
 #include <qscopedpointer.h>

src/corelib/kernel/qwinregistry_p.h

@@ -55,6 +55,7 @@
 #include <QtCore/qstring.h>
 #include <QtCore/qstringview.h>
 #include <QtCore/qt_windows.h>
+#include <QtCore/private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/corelib/platform/wasm/qstdweb_p.h

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2019 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <qglobal.h>
+#include <private/qglobal_p.h>
 #include <emscripten/val.h>
 #include <cstdint>
 #include <functional>

src/corelib/serialization/qcborcommon_p.h

@@ -42,6 +42,7 @@
 #define QCBORCOMMON_P_H
 
 #include "qcborcommon.h"
+#include "private/qglobal_p.h"
 
 //
 //  W A R N I N G

src/corelib/text/qdoublescanprint_p.h

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <qglobal.h>
+#include <private/qglobal_p.h>
 
 #if defined(Q_CC_MSVC) && (defined(QT_BOOTSTRAPPED) || defined(QT_NO_DOUBLECONVERSION))
 #  include <stdio.h>

src/corelib/text/qstringconverter_p.h

@@ -55,6 +55,7 @@
 #include <QtCore/qstring.h>
 #include <QtCore/qendian.h>
 #include <QtCore/qstringconverter.h>
+#include <QtCore/private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/corelib/thread/qfutex_p.h

@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <qglobal.h>
+#include <private/qglobal_p.h>
 
 #if (__has_feature(thread_sanitizer) || defined(__SANITIZE_THREAD__)) && __has_include(<sanitizer/tsan_interface.h>)
 #  include <sanitizer/tsan_interface.h>

src/corelib/thread/qlocking_p.h

@@ -53,6 +53,7 @@
 //
 
 #include <QtCore/qmutex.h>
+#include <QtCore/private/qglobal_p.h>
 
 #include <mutex>
 

src/corelib/thread/qwaitcondition_p.h

@@ -54,6 +54,7 @@
 #include <QtCore/QWaitCondition>
 #include <QtCore/QMutex>
 #include <QtCore/QDeadlineTimer>
+#include <QtCore/private/qglobal_p.h>
 
 #include <condition_variable>
 #include <mutex>

src/corelib/tools/qduplicatetracker_p.h

@@ -50,7 +50,7 @@
 // We mean it.
 //
 
-#include <qglobal.h>
+#include <private/qglobal_p.h>
 
 #if __has_include(<memory_resource>)
 #  include <unordered_set>

src/corelib/tools/qflatmap_p.h

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2020 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
@@ -52,6 +52,7 @@
 //
 
 #include "qlist.h"
+#include "private/qglobal_p.h"
 
 #include <algorithm>
 #include <functional>

src/corelib/tools/qmakearray_p.h

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2018 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include "QtCore/qglobal.h"
+#include "QtCore/private/qglobal_p.h"
 
 #include <array>
 #include <type_traits>

src/gui/accessible/linux/dbusconnection_p.h

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
@@ -55,6 +55,7 @@
 #include <QtCore/QString>
 #include <QtDBus/QDBusConnection>
 #include <QtDBus/QDBusVariant>
+#include <QtCore/private/qglobal_p.h>
 Q_MOC_INCLUDE(<QtDBus/QDBusError>)
 
 QT_BEGIN_NAMESPACE

src/gui/opengl/platform/egl/qt_egl_p.h

@@ -54,6 +54,7 @@
 // q(data/text)stream.h must be included before any header file that defines Status
 #include <QtCore/qdatastream.h>
 #include <QtCore/qtextstream.h>
+#include <QtCore/private/qglobal_p.h>
 
 #ifdef QT_EGL_NO_X11
 # ifndef EGL_NO_X11

src/gui/opengl/platform/unix/qglxconvenience_p.h

@@ -53,6 +53,7 @@
 
 #include <QtCore/qlist.h>
 #include <QtGui/qsurfaceformat.h>
+#include <QtCore/private/qglobal_p.h>
 
 #include <X11/Xlib.h>
 #include <GL/glx.h>

src/gui/painting/qcolormatrix_p.h

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2018 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
@@ -53,6 +53,7 @@
 
 #include <QtGui/qtguiglobal.h>
 #include <QtCore/qpoint.h>
+#include <QtCore/private/qglobal_p.h>
 #include <cmath>
 
 QT_BEGIN_NAMESPACE

src/gui/painting/qicc_p.h

@@ -53,6 +53,7 @@
 
 #include <QtCore/qbytearray.h>
 #include <QtGui/qtguiglobal.h>
+#include <QtCore/private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/gui/painting/qimagescale_p.h

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
@@ -51,6 +51,7 @@
 //
 
 #include <qimage.h>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/gui/painting/qmath_p.h

@@ -52,6 +52,7 @@
 //
 
 #include <qmath.h>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/gui/painting/qpen_p.h

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <QtCore/qglobal.h>
+#include <QtCore/private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/gui/painting/qpixellayout_p.h

@@ -55,6 +55,7 @@
 #include <QtGui/qimage.h>
 #include <QtGui/qrgba64.h>
 #include <QtGui/qrgbafloat.h>
+#include <QtCore/private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/gui/painting/qrasterbackingstore_p.h

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
@@ -52,6 +52,7 @@
 //
 
 #include <qpa/qplatformbackingstore.h>
+#include <private/qglobal_p.h>
 
 
 QT_BEGIN_NAMESPACE

src/gui/platform/unix/dbusmenu/qdbusmenuconnection_p.h

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
@@ -56,6 +56,7 @@
 #include <QtDBus/QDBusVariant>
 
 #include <QtGui/qtgui-config.h>
+#include <QtCore/private/qglobal_p.h>
 Q_MOC_INCLUDE(<QtDBus/QDBusError>)
 
 QT_BEGIN_NAMESPACE

src/gui/platform/unix/dbusmenu/qdbusmenuregistrarproxy_p.h

@@ -66,6 +66,7 @@
 #include <QtDBus/QDBusAbstractInterface>
 #include <QtDBus/QDBusConnection>
 #include <QtDBus/QDBusReply>
+#include <QtCore/private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/gui/platform/unix/dbusmenu/qdbusmenutypes_p.h

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
@@ -57,6 +57,7 @@
 #include <QDBusConnection>
 #include <QDBusObjectPath>
 #include <QPixmap>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/gui/platform/unix/dbustray/qxdgnotificationproxy_p.h

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
@@ -73,6 +73,7 @@
 #include <QDBusAbstractInterface>
 #include <QDBusPendingReply>
 #include <QDBusReply>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/gui/platform/unix/qgenericunixeventdispatcher_p.h

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the plugins of the Qt Toolkit.
@@ -52,6 +52,7 @@
 #define QGENERICUNIXEVENTDISPATCHER_P_H
 
 #include <QtGui/qtguiglobal.h>
+#include <QtCore/private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/gui/platform/unix/qgenericunixservices_p.h

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the plugins of the Qt Toolkit.
@@ -53,6 +53,7 @@
 
 #include <qpa/qplatformservices.h>
 #include <QtCore/QString>
+#include <QtCore/private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/gui/platform/unix/qgenericunixthemes_p.h

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the plugins of the Qt Toolkit.
@@ -55,6 +55,7 @@
 #include <QtCore/QString>
 #include <QtCore/QStringList>
 #include <QtGui/QFont>
+#include <QtCore/private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/gui/platform/unix/qtx11extras_p.h

@@ -52,6 +52,7 @@
 //
 
 #include <QtGui/qtguiglobal.h>
+#include <QtCore/private/qglobal_p.h>
 
 #include <xcb/xcb.h>
 

src/gui/platform/unix/qxkbcommon_p.h

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2018 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
@@ -55,6 +55,7 @@
 #include <QtCore/qstring.h>
 #include <QtCore/qloggingcategory.h>
 #include <QtCore/qlist.h>
+#include <QtCore/private/qglobal_p.h>
 
 #include <xkbcommon/xkbcommon.h>
 

src/gui/platform/wasm/qwasmlocalfileaccess_p.h

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <qglobal.h>
+#include <private/qglobal_p.h>
 #include <cstdint>
 #include <functional>
 

src/gui/platform/windows/qwindowsmime_p.h

@@ -55,6 +55,7 @@
 #include <QtCore/qvariant.h>
 
 #include <QtGui/qtguiglobal.h>
+#include <QtCore/private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/gui/rhi/cs_tdr_p.h

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2019 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the Qt Gui module
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <QtCore/qglobal.h>
+#include <QtCore/private/qglobal_p.h>
 
 #ifdef Q_OS_WIN
 

src/gui/rhi/qshaderdescription_p.h

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2019 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Gui module
@@ -54,6 +54,7 @@
 #include <QtGui/qtguiglobal.h>
 #include <QtCore/QString>
 #include <QtCore/QList>
+#include <QtCore/private/qglobal_p.h>
 #include <array>
 
 QT_BEGIN_NAMESPACE

src/gui/text/freetype/qfreetypefontdatabase_p.h

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the plugins of the Qt Toolkit.
@@ -54,6 +54,7 @@
 #include <qpa/qplatformfontdatabase.h>
 #include <QtCore/QByteArray>
 #include <QtCore/QString>
+#include <QtCore/private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/gui/text/qfontdatabase_p.h

@@ -54,6 +54,7 @@
 #include <QtCore/qcache.h>
 
 #include <QtGui/qfontdatabase.h>
+#include <QtCore/private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/gui/text/qinputcontrol_p.h

@@ -53,6 +53,7 @@
 
 #include <QtCore/qobject.h>
 #include <qtguiglobal.h>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/gui/text/qtextmarkdownimporter_p.h

@@ -58,6 +58,7 @@
 #include <QtGui/qtextlist.h>
 #include <QtCore/qpointer.h>
 #include <QtCore/qstack.h>
+#include <QtCore/private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/gui/text/windows/qwindowsnativeimage_p.h

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the plugins of the Qt Toolkit.
@@ -54,6 +54,7 @@
 #include <QtCore/QtGlobal>
 #include <QtCore/qt_windows.h>
 #include <QtGui/QImage>
+#include <QtCore/private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/gui/util/qedidparser_p.h

@@ -61,6 +61,7 @@
 #include <QtCore/qpoint.h>
 #include <QtCore/qsize.h>
 #include <QtCore/qstring.h>
+#include <QtCore/private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/gui/util/qedidvendortable_p.h

@@ -58,6 +58,8 @@
 // We mean it.
 //
 
+#include <QtCore/private/qglobal_p.h>
+
 QT_BEGIN_NAMESPACE
 
 struct VendorTable {

src/gui/util/qtexturefiledata_p.h

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2018 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
@@ -55,6 +55,7 @@
 #include <QSharedDataPointer>
 #include <QLoggingCategory>
 #include <QDebug>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/gui/vulkan/qbasicvulkanplatforminstance_p.h

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the plugins of the Qt Toolkit.
@@ -55,6 +55,7 @@
 
 #include <QtCore/QLibrary>
 #include <qpa/qplatformvulkaninstance.h>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/network/access/http2/bitstreams_p.h

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtNetwork module of the Qt Toolkit.
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <QtCore/qglobal.h>
+#include <QtCore/private/qglobal_p.h>
 #include <QtCore/qdebug.h>
 
 #include <type_traits>

src/network/access/http2/hpacktable_p.h

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtNetwork module of the Qt Toolkit.
@@ -52,7 +52,7 @@
 //
 
 #include <QtCore/qbytearray.h>
-#include <QtCore/qglobal.h>
+#include <QtCore/private/qglobal_p.h>
 #include <QtCore/qpair.h>
 
 #include <vector>

src/network/access/http2/http2protocol_p.h

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtNetwork module of the Qt Toolkit.
@@ -54,7 +54,7 @@
 #include <QtNetwork/qnetworkreply.h>
 #include <QtCore/qloggingcategory.h>
 #include <QtCore/qmetatype.h>
-#include <QtCore/qglobal.h>
+#include <QtCore/private/qglobal_p.h>
 #include <QtCore/qmap.h>
 
 // Different HTTP/2 constants/values as defined by RFC 7540.

src/network/access/http2/huffman_p.h

@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <QtCore/qglobal.h>
+#include <QtCore/private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/network/access/qnetworkaccessbackend_p.h

@@ -60,6 +60,7 @@
 #include <QtCore/qobject.h>
 #include <QtCore/qflags.h>
 #include <QtCore/qbytearrayview.h>
+#include <QtCore/private/qglobal_p.h>
 
 #if QT_CONFIG(ssl)
 #include <QtNetwork/qsslconfiguration.h>

src/opengl/qopenglcompositor_p.h

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the plugins of the Qt Toolkit.
@@ -56,6 +56,7 @@
 #include <QtCore/QTimer>
 #include <QtOpenGL/QOpenGLTextureBlitter>
 #include <QtGui/QMatrix4x4>
+#include <QtCore/private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/opengl/qopenglcompositorbackingstore_p.h

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the plugins of the Qt Toolkit.
@@ -56,6 +56,7 @@
 #include <qpa/qplatformbackingstore.h>
 #include <QImage>
 #include <QRegion>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/opengl/qopenglcustomshaderstage_p.h

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
@@ -53,6 +53,7 @@
 
 #include <QtOpenGL/qtopenglglobal.h>
 #include <QOpenGLShaderProgram>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/opengl/qopenglpaintdevice_p.h

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
@@ -52,6 +52,7 @@
 //
 
 #include <qopenglpaintdevice.h>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/opengl/qopenglshadercache_p.h

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
@@ -52,6 +52,7 @@
 #define QOPENGLSHADERCACHE_P_H
 
 #include <QtOpenGL/qtopenglglobal.h>
+#include <QtCore/private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/opengl/qopengltexturehelper_p.h

@@ -52,6 +52,7 @@
 //
 
 #include <QtOpenGL/qtopenglglobal.h>
+#include <QtCore/private/qglobal_p.h>
 
 #ifndef QT_NO_OPENGL
 

src/opengl/qopenglvertexarrayobject_p.h

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2014 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Sean Harmer <sean.harmer@kdab.com>
+** Copyright (C) 2020 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Sean Harmer <sean.harmer@kdab.com>
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
@@ -54,6 +54,7 @@
 #include <QtOpenGL/qtopenglglobal.h>
 
 #include <QtGui/qopengl.h>
+#include <QtCore/private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/opengl/qvkconvenience_p.h

@@ -53,6 +53,7 @@
 
 #include <QtOpenGL/qtopenglglobal.h>
 #include <qvulkaninstance.h>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/platformsupport/devicediscovery/qdevicediscovery_p.h

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the plugins of the Qt Toolkit.
@@ -54,6 +54,7 @@
 #include <QObject>
 #include <QSocketNotifier>
 #include <QStringList>
+#include <private/qglobal_p.h>
 
 #define QT_EVDEV_DEVICE_PATH "/dev/input/"
 #define QT_EVDEV_DEVICE_PREFIX "event"

src/platformsupport/fbconvenience/qfbbackingstore_p.h

@@ -53,6 +53,7 @@
 
 #include <qpa/qplatformbackingstore.h>
 #include <QtCore/QMutex>
+#include <QtCore/private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/platformsupport/fbconvenience/qfbwindow_p.h

@@ -52,6 +52,7 @@
 //
 
 #include <qpa/qplatformwindow.h>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h

@@ -52,6 +52,7 @@
 //
 
 #include "qnamespace.h"
+#include "private/qglobal_p.h"
 #ifdef Q_OS_FREEBSD
 #include <dev/evdev/input.h>
 #else

src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
@@ -54,6 +54,7 @@
 #include <qobject.h>
 #include <QTimer>
 #include <QDataStream>
+#include <private/qglobal_p.h>
 
 #include <memory>
 

src/platformsupport/input/evdevmouse/qevdevmousehandler_p.h

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
@@ -55,6 +55,7 @@
 #include <QString>
 #include <QPoint>
 #include <QEvent>
+#include <private/qglobal_p.h>
 
 #include <memory>
 

src/platformsupport/input/evdevtouch/qevdevtouchfilter_p.h

@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include <qglobal.h>
+#include <private/qglobal_p.h>
 
 //
 //  W A R N I N G

src/platformsupport/input/libinput/qlibinputhandler_p.h

@@ -43,6 +43,7 @@
 #include <QtCore/QObject>
 #include <QtCore/QScopedPointer>
 #include <QtCore/QMap>
+#include <QtCore/private/qglobal_p.h>
 
 //
 //  W A R N I N G

src/platformsupport/input/libinput/qlibinputpointer_p.h

@@ -41,6 +41,7 @@
 #define QLIBINPUTPOINTER_P_H
 
 #include <QtCore/QPoint>
+#include <QtCore/private/qglobal_p.h>
 
 //
 //  W A R N I N G

src/platformsupport/input/libinput/qlibinputtouch_p.h

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the plugins module of the Qt Toolkit.
@@ -44,6 +44,7 @@
 #include <QtCore/QList>
 #include <QtCore/QPointer>
 #include <qpa/qwindowsysteminterface.h>
+#include <private/qglobal_p.h>
 
 //
 //  W A R N I N G

src/platformsupport/input/shared/devicehandlerlist_p.h

@@ -52,6 +52,7 @@
 //
 
 #include <QString>
+#include <private/qglobal_p.h>
 
 #include <vector>
 #include <memory>

src/platformsupport/input/shared/qevdevutil_p.h

@@ -55,6 +55,7 @@
 #include <QString>
 #include <QStringList>
 #include <QStringView>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/platformsupport/input/shared/qoutputmapping_p.h

@@ -53,6 +53,7 @@
 
 #include <QString>
 #include <QHash>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/platformsupport/input/tslib/qtslib_p.h

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the plugins module of the Qt Toolkit.
@@ -52,6 +52,7 @@
 //
 
 #include <QObject>
+#include <private/qglobal_p.h>
 
 struct tsdev;
 

src/printsupport/platform/macos/qcocoaprintdevice_p.h

@@ -52,6 +52,7 @@
 //
 
 #include <qpa/qplatformprintdevice.h>
+#include <private/qglobal_p.h>
 
 #ifndef QT_NO_PRINTER
 

src/printsupport/platform/macos/qcocoaprintersupport_p.h

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtPrintSupport module of the Qt Toolkit.
@@ -52,6 +52,7 @@
 //
 
 #include <qpa/qplatformprintersupport.h>
+#include <private/qglobal_p.h>
 #ifndef QT_NO_PRINTER
 
 #include <QtPrintSupport/qtprintsupportglobal.h>

src/printsupport/platform/windows/qwindowsprintdevice_p.h

@@ -56,6 +56,7 @@
 
 #include <QtPrintSupport/qtprintsupportglobal.h>
 #include <QtCore/qt_windows.h>
+#include <QtCore/private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/printsupport/platform/windows/qwindowsprintersupport_p.h

@@ -54,6 +54,7 @@
 #include <QtPrintSupport/qtprintsupportglobal.h>
 
 #include <qpa/qplatformprintersupport.h>
+#include <private/qglobal_p.h>
 #ifndef QT_NO_PRINTER
 
 QT_BEGIN_NAMESPACE

src/testlib/qabstracttestlogger_p.h

@@ -52,6 +52,7 @@
 //
 
 #include <QtTest/qttestglobal.h>
+#include <QtCore/private/qglobal_p.h>
 
 #include <stdio.h>
 #include <stdlib.h>

src/testlib/qbenchmarkmeasurement_p.h

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtTest module of the Qt Toolkit.
@@ -52,6 +52,7 @@
 //
 
 #include <QtTest/qbenchmark.h>
+#include <QtCore/private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/testlib/qbenchmarkmetric_p.h

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtTest module of the Qt Toolkit.
@@ -53,6 +53,7 @@
 
 #include <QtTest/qttestglobal.h>
 #include <QtTest/qbenchmarkmetric.h>
+#include <QtCore/private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/testlib/qemulationdetector_p.h

@@ -40,7 +40,7 @@
 // We mean it.
 //
 
-#include <QtCore/qglobal.h>
+#include <QtCore/private/qglobal_p.h>
 
 #if defined(Q_OS_LINUX) && defined(Q_PROCESSOR_ARM)
 #define SHOULD_CHECK_ARM_ON_X86

src/testlib/qpropertytesthelper_p.h

@@ -55,6 +55,7 @@
 #include <QtCore/QProperty>
 #include <QtTest/QSignalSpy>
 #include <QTest>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/testlib/qsignaldumper_p.h

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtTest module of the Qt Toolkit.
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <qglobal.h>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/testlib/qtestblacklist_p.h

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtTest module of the Qt Toolkit.
@@ -52,6 +52,7 @@
 //
 
 #include <QtTest/qttestglobal.h>
+#include <QtCore/private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/testlib/qtestelementattribute_p.h

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtTest module of the Qt Toolkit.
@@ -52,6 +52,7 @@
 //
 
 #include <QtTest/qttestglobal.h>
+#include <QtCore/private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/testlib/qtesthelpers_p.h

@@ -55,6 +55,7 @@
 #include <QtCore/QString>
 #include <QtCore/QChar>
 #include <QtCore/QPoint>
+#include <QtCore/private/qglobal_p.h>
 
 #ifdef QT_GUI_LIB
 #include <QtGui/QGuiApplication>

src/testlib/qtestjunitstreamer_p.h

@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <QtCore/qglobal.h>
+#include <QtCore/private/qglobal_p.h>
 #include <vector>
 
 QT_BEGIN_NAMESPACE

src/testlib/qtestresult_p.h

@@ -52,6 +52,7 @@
 //
 
 #include <QtTest/qttestglobal.h>
+#include <QtCore/private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE