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/corelib/kernel | |
| 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/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qdeadlinetimer_p.h | 2 | ||||
| -rw-r--r-- | src/corelib/kernel/qfunctions_winrt_p.h | 2 | ||||
| -rw-r--r-- | src/corelib/kernel/qiterable_p.h | 2 | ||||
| -rw-r--r-- | src/corelib/kernel/qmetaobject_moc_p.h | 3 | ||||
| -rw-r--r-- | src/corelib/kernel/qpoll_p.h | 2 | ||||
| -rw-r--r-- | src/corelib/kernel/qproperty_p.h | 4 | ||||
| -rw-r--r-- | src/corelib/kernel/qwinregistry_p.h | 1 |
7 files changed, 9 insertions, 7 deletions
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 |