diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2015-07-09 15:20:59 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2022-02-24 12:07:00 -0800 |
| commit | 75e0d1b5c193cb1d421c44ef2be04d5f43739a91 (patch) | |
| tree | 07cc9d6054476121c4ec62805e7c7bd5f06efcd9 /src | |
| parent | 51ff94ec9224e35669428ec700bf17a1d4a094a8 (diff) | |
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>
Diffstat (limited to 'src')
105 files changed, 157 insertions, 77 deletions
diff --git a/src/corelib/global/qendian_p.h b/src/corelib/global/qendian_p.h index bc6194fb06..609b1a97be 100644 --- a/src/corelib/global/qendian_p.h +++ b/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 diff --git a/src/corelib/global/qlibraryinfo_p.h b/src/corelib/global/qlibraryinfo_p.h index f335c0d01a..363d91d0b4 100644 --- a/src/corelib/global/qlibraryinfo_p.h +++ b/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" diff --git a/src/corelib/global/qlogging_p.h b/src/corelib/global/qlogging_p.h index 3d0c097ffe..21e78449f6 100644 --- a/src/corelib/global/qlogging_p.h +++ b/src/corelib/global/qlogging_p.h @@ -51,6 +51,8 @@ // We mean it. // +#include <QtCore/private/qglobal_p.h> + QT_BEGIN_NAMESPACE namespace QtPrivate { diff --git a/src/corelib/global/qnativeinterface_p.h b/src/corelib/global/qnativeinterface_p.h index 65332eeecb..20898dad06 100644 --- a/src/corelib/global/qnativeinterface_p.h +++ b/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 diff --git a/src/corelib/global/qoperatingsystemversion_p.h b/src/corelib/global/qoperatingsystemversion_p.h index 6922f4ad54..05fa185a8d 100644 --- a/src/corelib/global/qoperatingsystemversion_p.h +++ b/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> diff --git a/src/corelib/global/qoperatingsystemversion_win_p.h b/src/corelib/global/qoperatingsystemversion_win_p.h index 446bd286fc..16af1e684c 100644 --- a/src/corelib/global/qoperatingsystemversion_win_p.h +++ b/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 diff --git a/src/corelib/global/qtrace_p.h b/src/corelib/global/qtrace_p.h index d9011c6066..821a6f5dd2 100644 --- a/src/corelib/global/qtrace_p.h +++ b/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 diff --git a/src/corelib/global/qvolatile_p.h b/src/corelib/global/qvolatile_p.h index 211cb3d90c..dc850560c7 100644 --- a/src/corelib/global/qvolatile_p.h +++ b/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 diff --git a/src/corelib/io/qntdll_p.h b/src/corelib/io/qntdll_p.h index 893bf40d23..e9e28d4fe4 100644 --- a/src/corelib/io/qntdll_p.h +++ b/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 diff --git a/src/corelib/kernel/qdeadlinetimer_p.h b/src/corelib/kernel/qdeadlinetimer_p.h index 46e12de6c1..4b54d7daaf 100644 --- a/src/corelib/kernel/qdeadlinetimer_p.h +++ b/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 diff --git a/src/corelib/kernel/qfunctions_winrt_p.h b/src/corelib/kernel/qfunctions_winrt_p.h index 8db94c124b..6df5978392 100644 --- a/src/corelib/kernel/qfunctions_winrt_p.h +++ b/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) diff --git a/src/corelib/kernel/qiterable_p.h b/src/corelib/kernel/qiterable_p.h index d975a591fb..cc662ef312 100644 --- a/src/corelib/kernel/qiterable_p.h +++ b/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 diff --git a/src/corelib/kernel/qmetaobject_moc_p.h b/src/corelib/kernel/qmetaobject_moc_p.h index 9770d9c576..ca2a99ab84 100644 --- a/src/corelib/kernel/qmetaobject_moc_p.h +++ b/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 diff --git a/src/corelib/kernel/qpoll_p.h b/src/corelib/kernel/qpoll_p.h index cb6ad82ae7..fd068b0031 100644 --- a/src/corelib/kernel/qpoll_p.h +++ b/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 diff --git a/src/corelib/kernel/qproperty_p.h b/src/corelib/kernel/qproperty_p.h index d80ed21102..21f9478835 100644 --- a/src/corelib/kernel/qproperty_p.h +++ b/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> diff --git a/src/corelib/kernel/qwinregistry_p.h b/src/corelib/kernel/qwinregistry_p.h index a456292835..f927cf595b 100644 --- a/src/corelib/kernel/qwinregistry_p.h +++ b/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 diff --git a/src/corelib/platform/wasm/qstdweb_p.h b/src/corelib/platform/wasm/qstdweb_p.h index cd3f029860..5b134621f4 100644 --- a/src/corelib/platform/wasm/qstdweb_p.h +++ b/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> diff --git a/src/corelib/serialization/qcborcommon_p.h b/src/corelib/serialization/qcborcommon_p.h index 9b7f4b7099..1f2cbe863f 100644 --- a/src/corelib/serialization/qcborcommon_p.h +++ b/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 diff --git a/src/corelib/text/qdoublescanprint_p.h b/src/corelib/text/qdoublescanprint_p.h index 3865c69a99..d815241d31 100644 --- a/src/corelib/text/qdoublescanprint_p.h +++ b/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> diff --git a/src/corelib/text/qstringconverter_p.h b/src/corelib/text/qstringconverter_p.h index 2ad59af23c..b4e2f675ff 100644 --- a/src/corelib/text/qstringconverter_p.h +++ b/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 diff --git a/src/corelib/thread/qfutex_p.h b/src/corelib/thread/qfutex_p.h index 037207a5c0..bda8f03ee1 100644 --- a/src/corelib/thread/qfutex_p.h +++ b/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> diff --git a/src/corelib/thread/qlocking_p.h b/src/corelib/thread/qlocking_p.h index 5fb80454df..2c4b2c59f0 100644 --- a/src/corelib/thread/qlocking_p.h +++ b/src/corelib/thread/qlocking_p.h @@ -53,6 +53,7 @@ // #include <QtCore/qmutex.h> +#include <QtCore/private/qglobal_p.h> #include <mutex> diff --git a/src/corelib/thread/qwaitcondition_p.h b/src/corelib/thread/qwaitcondition_p.h index 26a7e03ba7..a007316940 100644 --- a/src/corelib/thread/qwaitcondition_p.h +++ b/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> diff --git a/src/corelib/tools/qduplicatetracker_p.h b/src/corelib/tools/qduplicatetracker_p.h index eab63bab9b..9832d8f4d2 100644 --- a/src/corelib/tools/qduplicatetracker_p.h +++ b/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> diff --git a/src/corelib/tools/qflatmap_p.h b/src/corelib/tools/qflatmap_p.h index 2c40576f17..18d5dec652 100644 --- a/src/corelib/tools/qflatmap_p.h +++ b/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> diff --git a/src/corelib/tools/qmakearray_p.h b/src/corelib/tools/qmakearray_p.h index 4ed8c16234..d3137ccabd 100644 --- a/src/corelib/tools/qmakearray_p.h +++ b/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> diff --git a/src/gui/accessible/linux/dbusconnection_p.h b/src/gui/accessible/linux/dbusconnection_p.h index 826630fddc..d82edc753a 100644 --- a/src/gui/accessible/linux/dbusconnection_p.h +++ b/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 diff --git a/src/gui/opengl/platform/egl/qt_egl_p.h b/src/gui/opengl/platform/egl/qt_egl_p.h index 5d4e2fd6d4..959487f84e 100644 --- a/src/gui/opengl/platform/egl/qt_egl_p.h +++ b/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 diff --git a/src/gui/opengl/platform/unix/qglxconvenience_p.h b/src/gui/opengl/platform/unix/qglxconvenience_p.h index ecd8737f87..db574671fa 100644 --- a/src/gui/opengl/platform/unix/qglxconvenience_p.h +++ b/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> diff --git a/src/gui/painting/qcolormatrix_p.h b/src/gui/painting/qcolormatrix_p.h index 87a61ab219..bae3de489c 100644 --- a/src/gui/painting/qcolormatrix_p.h +++ b/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 diff --git a/src/gui/painting/qicc_p.h b/src/gui/painting/qicc_p.h index 2a4658b84b..877a9f3ae4 100644 --- a/src/gui/painting/qicc_p.h +++ b/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 diff --git a/src/gui/painting/qimagescale_p.h b/src/gui/painting/qimagescale_p.h index a9a4c0f858..ee3ae32a80 100644 --- a/src/gui/painting/qimagescale_p.h +++ b/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 diff --git a/src/gui/painting/qmath_p.h b/src/gui/painting/qmath_p.h index 7cc3612113..0191f8381f 100644 --- a/src/gui/painting/qmath_p.h +++ b/src/gui/painting/qmath_p.h @@ -52,6 +52,7 @@ // #include <qmath.h> +#include <private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/gui/painting/qpen_p.h b/src/gui/painting/qpen_p.h index e86b72a6e6..afe43f8bba 100644 --- a/src/gui/painting/qpen_p.h +++ b/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 diff --git a/src/gui/painting/qpixellayout_p.h b/src/gui/painting/qpixellayout_p.h index 519ae19cb1..00542f23f4 100644 --- a/src/gui/painting/qpixellayout_p.h +++ b/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 diff --git a/src/gui/painting/qrasterbackingstore_p.h b/src/gui/painting/qrasterbackingstore_p.h index 01d75c655b..ec9eeada0c 100644 --- a/src/gui/painting/qrasterbackingstore_p.h +++ b/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 diff --git a/src/gui/platform/unix/dbusmenu/qdbusmenuconnection_p.h b/src/gui/platform/unix/dbusmenu/qdbusmenuconnection_p.h index 012f83fe0e..80a82bb93f 100644 --- a/src/gui/platform/unix/dbusmenu/qdbusmenuconnection_p.h +++ b/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 diff --git a/src/gui/platform/unix/dbusmenu/qdbusmenuregistrarproxy_p.h b/src/gui/platform/unix/dbusmenu/qdbusmenuregistrarproxy_p.h index cffc080f87..9d5e25ea30 100644 --- a/src/gui/platform/unix/dbusmenu/qdbusmenuregistrarproxy_p.h +++ b/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 diff --git a/src/gui/platform/unix/dbusmenu/qdbusmenutypes_p.h b/src/gui/platform/unix/dbusmenu/qdbusmenutypes_p.h index 092798d9e3..8b2b1db01e 100644 --- a/src/gui/platform/unix/dbusmenu/qdbusmenutypes_p.h +++ b/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 diff --git a/src/gui/platform/unix/dbustray/qxdgnotificationproxy_p.h b/src/gui/platform/unix/dbustray/qxdgnotificationproxy_p.h index eb916e7512..74b65b4330 100644 --- a/src/gui/platform/unix/dbustray/qxdgnotificationproxy_p.h +++ b/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 diff --git a/src/gui/platform/unix/qgenericunixeventdispatcher_p.h b/src/gui/platform/unix/qgenericunixeventdispatcher_p.h index c567463772..6bbbc9551d 100644 --- a/src/gui/platform/unix/qgenericunixeventdispatcher_p.h +++ b/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 diff --git a/src/gui/platform/unix/qgenericunixservices_p.h b/src/gui/platform/unix/qgenericunixservices_p.h index 0634360c41..6af69f76b3 100644 --- a/src/gui/platform/unix/qgenericunixservices_p.h +++ b/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 diff --git a/src/gui/platform/unix/qgenericunixthemes_p.h b/src/gui/platform/unix/qgenericunixthemes_p.h index 0870275888..089216d911 100644 --- a/src/gui/platform/unix/qgenericunixthemes_p.h +++ b/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 diff --git a/src/gui/platform/unix/qtx11extras_p.h b/src/gui/platform/unix/qtx11extras_p.h index aed46a82b4..0e25999129 100644 --- a/src/gui/platform/unix/qtx11extras_p.h +++ b/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> diff --git a/src/gui/platform/unix/qxkbcommon_p.h b/src/gui/platform/unix/qxkbcommon_p.h index 7575b2627d..635133235d 100644 --- a/src/gui/platform/unix/qxkbcommon_p.h +++ b/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> diff --git a/src/gui/platform/wasm/qwasmlocalfileaccess_p.h b/src/gui/platform/wasm/qwasmlocalfileaccess_p.h index ccd88570c8..dc31ec467c 100644 --- a/src/gui/platform/wasm/qwasmlocalfileaccess_p.h +++ b/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> diff --git a/src/gui/platform/windows/qwindowsmime_p.h b/src/gui/platform/windows/qwindowsmime_p.h index 71b1c8a87f..8755232acd 100644 --- a/src/gui/platform/windows/qwindowsmime_p.h +++ b/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 diff --git a/src/gui/rhi/cs_tdr_p.h b/src/gui/rhi/cs_tdr_p.h index 534e793ad2..7fce948da9 100644 --- a/src/gui/rhi/cs_tdr_p.h +++ b/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 diff --git a/src/gui/rhi/qshaderdescription_p.h b/src/gui/rhi/qshaderdescription_p.h index 347fbfd36d..1fa08da0f5 100644 --- a/src/gui/rhi/qshaderdescription_p.h +++ b/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 diff --git a/src/gui/text/freetype/qfreetypefontdatabase_p.h b/src/gui/text/freetype/qfreetypefontdatabase_p.h index 2cc725bd06..1265cb74b9 100644 --- a/src/gui/text/freetype/qfreetypefontdatabase_p.h +++ b/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 diff --git a/src/gui/text/qfontdatabase_p.h b/src/gui/text/qfontdatabase_p.h index bf7efc27ef..8d931a2f55 100644 --- a/src/gui/text/qfontdatabase_p.h +++ b/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 diff --git a/src/gui/text/qinputcontrol_p.h b/src/gui/text/qinputcontrol_p.h index b4c1ca8f8f..01afc8aa74 100644 --- a/src/gui/text/qinputcontrol_p.h +++ b/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 diff --git a/src/gui/text/qtextmarkdownimporter_p.h b/src/gui/text/qtextmarkdownimporter_p.h index 12a7c5a3a6..82a9a82179 100644 --- a/src/gui/text/qtextmarkdownimporter_p.h +++ b/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 diff --git a/src/gui/text/windows/qwindowsnativeimage_p.h b/src/gui/text/windows/qwindowsnativeimage_p.h index 050ecbf03c..8ca11da5fd 100644 --- a/src/gui/text/windows/qwindowsnativeimage_p.h +++ b/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 diff --git a/src/gui/util/qedidparser_p.h b/src/gui/util/qedidparser_p.h index f18c2f1ad1..aebd1317b4 100644 --- a/src/gui/util/qedidparser_p.h +++ b/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 diff --git a/src/gui/util/qedidvendortable_p.h b/src/gui/util/qedidvendortable_p.h index e6bbb8f87e..b190cf1eef 100644 --- a/src/gui/util/qedidvendortable_p.h +++ b/src/gui/util/qedidvendortable_p.h @@ -58,6 +58,8 @@ // We mean it. // +#include <QtCore/private/qglobal_p.h> + QT_BEGIN_NAMESPACE struct VendorTable { diff --git a/src/gui/util/qtexturefiledata_p.h b/src/gui/util/qtexturefiledata_p.h index e553733d69..a5129e2424 100644 --- a/src/gui/util/qtexturefiledata_p.h +++ b/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 diff --git a/src/gui/vulkan/qbasicvulkanplatforminstance_p.h b/src/gui/vulkan/qbasicvulkanplatforminstance_p.h index 2391452f03..0fdebd3870 100644 --- a/src/gui/vulkan/qbasicvulkanplatforminstance_p.h +++ b/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 diff --git a/src/network/access/http2/bitstreams_p.h b/src/network/access/http2/bitstreams_p.h index ca272062a6..fd1ed9cc30 100644 --- a/src/network/access/http2/bitstreams_p.h +++ b/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> diff --git a/src/network/access/http2/hpacktable_p.h b/src/network/access/http2/hpacktable_p.h index 587d86f09c..c9b353a863 100644 --- a/src/network/access/http2/hpacktable_p.h +++ b/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> diff --git a/src/network/access/http2/http2protocol_p.h b/src/network/access/http2/http2protocol_p.h index ed5f2bf561..1bec7fda61 100644 --- a/src/network/access/http2/http2protocol_p.h +++ b/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. diff --git a/src/network/access/http2/huffman_p.h b/src/network/access/http2/huffman_p.h index c5324d42b1..8c1ca7da6b 100644 --- a/src/network/access/http2/huffman_p.h +++ b/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 diff --git a/src/network/access/qnetworkaccessbackend_p.h b/src/network/access/qnetworkaccessbackend_p.h index d2742c180c..89030d588b 100644 --- a/src/network/access/qnetworkaccessbackend_p.h +++ b/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> diff --git a/src/opengl/qopenglcompositor_p.h b/src/opengl/qopenglcompositor_p.h index d0d1c9303d..27ede567a8 100644 --- a/src/opengl/qopenglcompositor_p.h +++ b/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 diff --git a/src/opengl/qopenglcompositorbackingstore_p.h b/src/opengl/qopenglcompositorbackingstore_p.h index fcce75ab4e..6c61ab1bff 100644 --- a/src/opengl/qopenglcompositorbackingstore_p.h +++ b/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 diff --git a/src/opengl/qopenglcustomshaderstage_p.h b/src/opengl/qopenglcustomshaderstage_p.h index 255c115e3c..0e63acbcaa 100644 --- a/src/opengl/qopenglcustomshaderstage_p.h +++ b/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 diff --git a/src/opengl/qopenglpaintdevice_p.h b/src/opengl/qopenglpaintdevice_p.h index f4f02e7b57..a23d89252f 100644 --- a/src/opengl/qopenglpaintdevice_p.h +++ b/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 diff --git a/src/opengl/qopenglshadercache_p.h b/src/opengl/qopenglshadercache_p.h index 88efa34216..15ea6d2015 100644 --- a/src/opengl/qopenglshadercache_p.h +++ b/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 diff --git a/src/opengl/qopengltexturehelper_p.h b/src/opengl/qopengltexturehelper_p.h index d3c17c33a4..62a6fb5639 100644 --- a/src/opengl/qopengltexturehelper_p.h +++ b/src/opengl/qopengltexturehelper_p.h @@ -52,6 +52,7 @@ // #include <QtOpenGL/qtopenglglobal.h> +#include <QtCore/private/qglobal_p.h> #ifndef QT_NO_OPENGL diff --git a/src/opengl/qopenglvertexarrayobject_p.h b/src/opengl/qopenglvertexarrayobject_p.h index bd50d86073..c1517dcae8 100644 --- a/src/opengl/qopenglvertexarrayobject_p.h +++ b/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 diff --git a/src/opengl/qvkconvenience_p.h b/src/opengl/qvkconvenience_p.h index bc8694979b..d4ac489d1a 100644 --- a/src/opengl/qvkconvenience_p.h +++ b/src/opengl/qvkconvenience_p.h @@ -53,6 +53,7 @@ #include <QtOpenGL/qtopenglglobal.h> #include <qvulkaninstance.h> +#include <private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/platformsupport/devicediscovery/qdevicediscovery_p.h b/src/platformsupport/devicediscovery/qdevicediscovery_p.h index f1f50e9708..5eefba9dfa 100644 --- a/src/platformsupport/devicediscovery/qdevicediscovery_p.h +++ b/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" diff --git a/src/platformsupport/fbconvenience/qfbbackingstore_p.h b/src/platformsupport/fbconvenience/qfbbackingstore_p.h index c4762c9327..88dddd080a 100644 --- a/src/platformsupport/fbconvenience/qfbbackingstore_p.h +++ b/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 diff --git a/src/platformsupport/fbconvenience/qfbwindow_p.h b/src/platformsupport/fbconvenience/qfbwindow_p.h index 76b34ce041..0b08e0bd01 100644 --- a/src/platformsupport/fbconvenience/qfbwindow_p.h +++ b/src/platformsupport/fbconvenience/qfbwindow_p.h @@ -52,6 +52,7 @@ // #include <qpa/qplatformwindow.h> +#include <private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h b/src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h index 17bf0fb797..bfce2792ec 100644 --- a/src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h +++ b/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 diff --git a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h index 24ed1b64a8..7a47a7dd59 100644 --- a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h +++ b/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> diff --git a/src/platformsupport/input/evdevmouse/qevdevmousehandler_p.h b/src/platformsupport/input/evdevmouse/qevdevmousehandler_p.h index 8fcf49200b..350164a1c0 100644 --- a/src/platformsupport/input/evdevmouse/qevdevmousehandler_p.h +++ b/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> diff --git a/src/platformsupport/input/evdevtouch/qevdevtouchfilter_p.h b/src/platformsupport/input/evdevtouch/qevdevtouchfilter_p.h index ff6085d725..cc00474f95 100644 --- a/src/platformsupport/input/evdevtouch/qevdevtouchfilter_p.h +++ b/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 diff --git a/src/platformsupport/input/libinput/qlibinputhandler_p.h b/src/platformsupport/input/libinput/qlibinputhandler_p.h index ac7a267a4d..d9a65d5ff6 100644 --- a/src/platformsupport/input/libinput/qlibinputhandler_p.h +++ b/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 diff --git a/src/platformsupport/input/libinput/qlibinputpointer_p.h b/src/platformsupport/input/libinput/qlibinputpointer_p.h index 55d4a5f919..3c41e2d09a 100644 --- a/src/platformsupport/input/libinput/qlibinputpointer_p.h +++ b/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 diff --git a/src/platformsupport/input/libinput/qlibinputtouch_p.h b/src/platformsupport/input/libinput/qlibinputtouch_p.h index 67c20b9af6..431fd320fa 100644 --- a/src/platformsupport/input/libinput/qlibinputtouch_p.h +++ b/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 diff --git a/src/platformsupport/input/shared/devicehandlerlist_p.h b/src/platformsupport/input/shared/devicehandlerlist_p.h index 97794d4d7d..53f4c66505 100644 --- a/src/platformsupport/input/shared/devicehandlerlist_p.h +++ b/src/platformsupport/input/shared/devicehandlerlist_p.h @@ -52,6 +52,7 @@ // #include <QString> +#include <private/qglobal_p.h> #include <vector> #include <memory> diff --git a/src/platformsupport/input/shared/qevdevutil_p.h b/src/platformsupport/input/shared/qevdevutil_p.h index 7b5b0f52d1..0ac4b26197 100644 --- a/src/platformsupport/input/shared/qevdevutil_p.h +++ b/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 diff --git a/src/platformsupport/input/shared/qoutputmapping_p.h b/src/platformsupport/input/shared/qoutputmapping_p.h index 5376672eff..46c1e7eb2b 100644 --- a/src/platformsupport/input/shared/qoutputmapping_p.h +++ b/src/platformsupport/input/shared/qoutputmapping_p.h @@ -53,6 +53,7 @@ #include <QString> #include <QHash> +#include <private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/platformsupport/input/tslib/qtslib_p.h b/src/platformsupport/input/tslib/qtslib_p.h index b49531ebd3..ce3a59dc28 100644 --- a/src/platformsupport/input/tslib/qtslib_p.h +++ b/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; diff --git a/src/printsupport/platform/macos/qcocoaprintdevice_p.h b/src/printsupport/platform/macos/qcocoaprintdevice_p.h index f40a3b2666..33b96f6ec4 100644 --- a/src/printsupport/platform/macos/qcocoaprintdevice_p.h +++ b/src/printsupport/platform/macos/qcocoaprintdevice_p.h @@ -52,6 +52,7 @@ // #include <qpa/qplatformprintdevice.h> +#include <private/qglobal_p.h> #ifndef QT_NO_PRINTER diff --git a/src/printsupport/platform/macos/qcocoaprintersupport_p.h b/src/printsupport/platform/macos/qcocoaprintersupport_p.h index c12e8c355b..7a0b05043d 100644 --- a/src/printsupport/platform/macos/qcocoaprintersupport_p.h +++ b/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> diff --git a/src/printsupport/platform/windows/qwindowsprintdevice_p.h b/src/printsupport/platform/windows/qwindowsprintdevice_p.h index bbae4971b7..22631a2206 100644 --- a/src/printsupport/platform/windows/qwindowsprintdevice_p.h +++ b/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 diff --git a/src/printsupport/platform/windows/qwindowsprintersupport_p.h b/src/printsupport/platform/windows/qwindowsprintersupport_p.h index a43fdb8d0a..8a38665147 100644 --- a/src/printsupport/platform/windows/qwindowsprintersupport_p.h +++ b/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 diff --git a/src/testlib/qabstracttestlogger_p.h b/src/testlib/qabstracttestlogger_p.h index fa23484055..31fc3d60ba 100644 --- a/src/testlib/qabstracttestlogger_p.h +++ b/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> diff --git a/src/testlib/qbenchmarkmeasurement_p.h b/src/testlib/qbenchmarkmeasurement_p.h index 1e2b82c25d..a993570c5e 100644 --- a/src/testlib/qbenchmarkmeasurement_p.h +++ b/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 diff --git a/src/testlib/qbenchmarkmetric_p.h b/src/testlib/qbenchmarkmetric_p.h index 049b9711e2..b75113b954 100644 --- a/src/testlib/qbenchmarkmetric_p.h +++ b/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 diff --git a/src/testlib/qemulationdetector_p.h b/src/testlib/qemulationdetector_p.h index 3ae3d07839..e33075253a 100644 --- a/src/testlib/qemulationdetector_p.h +++ b/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 diff --git a/src/testlib/qpropertytesthelper_p.h b/src/testlib/qpropertytesthelper_p.h index 45d665136d..fe3b7501b6 100644 --- a/src/testlib/qpropertytesthelper_p.h +++ b/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 diff --git a/src/testlib/qsignaldumper_p.h b/src/testlib/qsignaldumper_p.h index e211f5c059..b9c9b5ad3a 100644 --- a/src/testlib/qsignaldumper_p.h +++ b/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 diff --git a/src/testlib/qtestblacklist_p.h b/src/testlib/qtestblacklist_p.h index 4522c64992..ebcb8082b2 100644 --- a/src/testlib/qtestblacklist_p.h +++ b/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 diff --git a/src/testlib/qtestelementattribute_p.h b/src/testlib/qtestelementattribute_p.h index 6212e7b18a..2a2b234a0c 100644 --- a/src/testlib/qtestelementattribute_p.h +++ b/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 diff --git a/src/testlib/qtesthelpers_p.h b/src/testlib/qtesthelpers_p.h index 0e39f7aea2..1995bb4873 100644 --- a/src/testlib/qtesthelpers_p.h +++ b/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> diff --git a/src/testlib/qtestjunitstreamer_p.h b/src/testlib/qtestjunitstreamer_p.h index 83b070d856..50911f4321 100644 --- a/src/testlib/qtestjunitstreamer_p.h +++ b/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 diff --git a/src/testlib/qtestresult_p.h b/src/testlib/qtestresult_p.h index ba2237afec..2034c006ad 100644 --- a/src/testlib/qtestresult_p.h +++ b/src/testlib/qtestresult_p.h @@ -52,6 +52,7 @@ // #include <QtTest/qttestglobal.h> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/testlib/qtesttable_p.h b/src/testlib/qtesttable_p.h index d2f389a134..fee2467e88 100644 --- a/src/testlib/qtesttable_p.h +++ b/src/testlib/qtesttable_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 diff --git a/src/testlib/qtestutil_macos_p.h b/src/testlib/qtestutil_macos_p.h index c9a152dfdb..083075b176 100644 --- a/src/testlib/qtestutil_macos_p.h +++ b/src/testlib/qtestutil_macos_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 QtTest module of the Qt Toolkit. @@ -51,7 +51,7 @@ // We mean it. // -#include <qglobal.h> +#include <private/qglobal_p.h> #import <objc/objc.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/itemviews/qtreewidgetitemiterator_p.h b/src/widgets/itemviews/qtreewidgetitemiterator_p.h index e68f6103d3..eb8d3aa186 100644 --- a/src/widgets/itemviews/qtreewidgetitemiterator_p.h +++ b/src/widgets/itemviews/qtreewidgetitemiterator_p.h @@ -54,6 +54,7 @@ #include <QtCore/qstack.h> #include "qtreewidgetitemiterator.h" +#include "private/qglobal_p.h" #if QT_CONFIG(treewidget) QT_BEGIN_NAMESPACE diff --git a/src/xml/dom/qdom_p.h b/src/xml/dom/qdom_p.h index 4979f17b39..d383512fbd 100644 --- a/src/xml/dom/qdom_p.h +++ b/src/xml/dom/qdom_p.h @@ -41,7 +41,7 @@ #include "qdom.h" -#include <qglobal.h> +#include <private/qglobal_p.h> #include <qhash.h> #include <qstring.h> #include <qlist.h> diff --git a/src/xml/dom/qdomhelpers_p.h b/src/xml/dom/qdomhelpers_p.h index 22e23e7a21..d5e9db5f02 100644 --- a/src/xml/dom/qdomhelpers_p.h +++ b/src/xml/dom/qdomhelpers_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 QtXml module of the Qt Toolkit. @@ -40,7 +40,7 @@ #define QDOMHELPERS_P_H #include <qcoreapplication.h> -#include <qglobal.h> +#include <private/qglobal_p.h> QT_BEGIN_NAMESPACE |