diff options
114 files changed, 189 insertions, 100 deletions
diff --git a/src/labs/folderlistmodel/fileproperty_p.h b/src/labs/folderlistmodel/fileproperty_p.h index 48be4a3d85..aaaf03babf 100644 --- a/src/labs/folderlistmodel/fileproperty_p.h +++ b/src/labs/folderlistmodel/fileproperty_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 examples of the Qt Toolkit. @@ -53,6 +53,7 @@ #include <QFileInfo> #include <QDateTime> +#include <private/qglobal_p.h> class FileProperty { diff --git a/src/labs/platform/qquicklabsplatformdialog_p.h b/src/labs/platform/qquicklabsplatformdialog_p.h index a50ef411ca..69a9875c53 100644 --- a/src/labs/platform/qquicklabsplatformdialog_p.h +++ b/src/labs/platform/qquicklabsplatformdialog_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Labs Platform module of the Qt Toolkit. @@ -57,6 +57,7 @@ #include <QtQml/qqmlparserstatus.h> #include <QtQml/qqmllist.h> #include <QtQml/qqml.h> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/labs/platform/qquicklabsplatformicon_p.h b/src/labs/platform/qquicklabsplatformicon_p.h index 9b6e280805..75de7c4f7f 100644 --- a/src/labs/platform/qquicklabsplatformicon_p.h +++ b/src/labs/platform/qquicklabsplatformicon_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2018 The Qt Company Ltd. +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Labs Platform module of the Qt Toolkit. @@ -55,6 +55,7 @@ #include <QtCore/qstring.h> #include <QtQml/qqmlengine.h> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/labs/platform/qquicklabsplatformmenubar_p.h b/src/labs/platform/qquicklabsplatformmenubar_p.h index 0166ec27f1..3b21a4f5ab 100644 --- a/src/labs/platform/qquicklabsplatformmenubar_p.h +++ b/src/labs/platform/qquicklabsplatformmenubar_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 Qt Labs Platform module of the Qt Toolkit. @@ -55,6 +55,7 @@ #include <QtQml/qqmlparserstatus.h> #include <QtQml/qqmllist.h> #include <QtQml/qqml.h> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/labs/platform/qquicklabsplatformmenuitemgroup_p.h b/src/labs/platform/qquicklabsplatformmenuitemgroup_p.h index 0c25244a6d..62ed0c255d 100644 --- a/src/labs/platform/qquicklabsplatformmenuitemgroup_p.h +++ b/src/labs/platform/qquicklabsplatformmenuitemgroup_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 Qt Labs Templates module of the Qt Toolkit. @@ -54,6 +54,7 @@ #include <QtCore/qobject.h> #include <QtCore/qlist.h> #include <QtQml/qqml.h> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/labs/platform/qquicklabsplatformstandardpaths_p.h b/src/labs/platform/qquicklabsplatformstandardpaths_p.h index 01f2901609..9a332dd19c 100644 --- a/src/labs/platform/qquicklabsplatformstandardpaths_p.h +++ b/src/labs/platform/qquicklabsplatformstandardpaths_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Labs Platform module of the Qt Toolkit. @@ -55,6 +55,7 @@ #include <QtCore/qstandardpaths.h> #include <QtCore/qurl.h> #include <QtQml/qqml.h> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/labs/platform/widgets/qwidgetplatformcolordialog_p.h b/src/labs/platform/widgets/qwidgetplatformcolordialog_p.h index 699ad2e06b..aa248377f5 100644 --- a/src/labs/platform/widgets/qwidgetplatformcolordialog_p.h +++ b/src/labs/platform/widgets/qwidgetplatformcolordialog_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 Qt Labs Platform module of the Qt Toolkit. @@ -52,6 +52,7 @@ // #include <QtGui/qpa/qplatformdialoghelper.h> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/labs/platform/widgets/qwidgetplatformdialog_p.h b/src/labs/platform/widgets/qwidgetplatformdialog_p.h index 5cc8cf1b9d..2a3cbc6a29 100644 --- a/src/labs/platform/widgets/qwidgetplatformdialog_p.h +++ b/src/labs/platform/widgets/qwidgetplatformdialog_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 Qt Labs Platform module of the Qt Toolkit. @@ -52,6 +52,7 @@ // #include <QtCore/qnamespace.h> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/labs/platform/widgets/qwidgetplatformfiledialog_p.h b/src/labs/platform/widgets/qwidgetplatformfiledialog_p.h index bd2aa9533d..005b67eec6 100644 --- a/src/labs/platform/widgets/qwidgetplatformfiledialog_p.h +++ b/src/labs/platform/widgets/qwidgetplatformfiledialog_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 Qt Labs Platform module of the Qt Toolkit. @@ -52,6 +52,7 @@ // #include <QtGui/qpa/qplatformdialoghelper.h> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/labs/platform/widgets/qwidgetplatformfontdialog_p.h b/src/labs/platform/widgets/qwidgetplatformfontdialog_p.h index b541c9b9e5..0952b65bdb 100644 --- a/src/labs/platform/widgets/qwidgetplatformfontdialog_p.h +++ b/src/labs/platform/widgets/qwidgetplatformfontdialog_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 Qt Labs Platform module of the Qt Toolkit. @@ -52,6 +52,7 @@ // #include <QtGui/qpa/qplatformdialoghelper.h> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/labs/platform/widgets/qwidgetplatformmenu_p.h b/src/labs/platform/widgets/qwidgetplatformmenu_p.h index 7032b6bf66..c6dcdbedc2 100644 --- a/src/labs/platform/widgets/qwidgetplatformmenu_p.h +++ b/src/labs/platform/widgets/qwidgetplatformmenu_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Labs Platform module of the Qt Toolkit. @@ -52,6 +52,7 @@ // #include <QtGui/qpa/qplatformmenu.h> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/labs/platform/widgets/qwidgetplatformmenuitem_p.h b/src/labs/platform/widgets/qwidgetplatformmenuitem_p.h index 321b67fea2..f180a87f6a 100644 --- a/src/labs/platform/widgets/qwidgetplatformmenuitem_p.h +++ b/src/labs/platform/widgets/qwidgetplatformmenuitem_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 Qt Labs Platform module of the Qt Toolkit. @@ -52,6 +52,7 @@ // #include <QtGui/qpa/qplatformmenu.h> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/labs/platform/widgets/qwidgetplatformmessagedialog_p.h b/src/labs/platform/widgets/qwidgetplatformmessagedialog_p.h index dc72542586..c54c380f42 100644 --- a/src/labs/platform/widgets/qwidgetplatformmessagedialog_p.h +++ b/src/labs/platform/widgets/qwidgetplatformmessagedialog_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 Qt Labs Platform module of the Qt Toolkit. @@ -52,6 +52,7 @@ // #include <QtGui/qpa/qplatformdialoghelper.h> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/labs/platform/widgets/qwidgetplatformsystemtrayicon_p.h b/src/labs/platform/widgets/qwidgetplatformsystemtrayicon_p.h index 6a7e968986..c263e984ce 100644 --- a/src/labs/platform/widgets/qwidgetplatformsystemtrayicon_p.h +++ b/src/labs/platform/widgets/qwidgetplatformsystemtrayicon_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 Qt Labs Platform module of the Qt Toolkit. @@ -52,6 +52,7 @@ // #include <QtGui/qpa/qplatformsystemtrayicon.h> +#include <QtCore/private/qglobal_p.h> QT_REQUIRE_CONFIG(systemtrayicon); diff --git a/src/particles/qquickdirection_p.h b/src/particles/qquickdirection_p.h index 58b5b43322..7621500213 100644 --- a/src/particles/qquickdirection_p.h +++ b/src/particles/qquickdirection_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 QtQuick module of the Qt Toolkit. @@ -54,6 +54,7 @@ #include <QObject> #include <QPointF> #include <QtQml/qqml.h> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/particles/qquickparticleextruder_p.h b/src/particles/qquickparticleextruder_p.h index 7e84dba50c..286e3c15db 100644 --- a/src/particles/qquickparticleextruder_p.h +++ b/src/particles/qquickparticleextruder_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 QtQuick module of the Qt Toolkit. @@ -55,6 +55,7 @@ #include <QRectF> #include <QPointF> #include <QtQml/qqml.h> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/qml/common/qqmljsmemorypool_p.h b/src/qml/common/qqmljsmemorypool_p.h index e8d49b40fd..f4ac4515dd 100644 --- a/src/qml/common/qqmljsmemorypool_p.h +++ b/src/qml/common/qqmljsmemorypool_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 QtQml module of the Qt Toolkit. @@ -51,7 +51,7 @@ // We mean it. // -#include <QtCore/qglobal.h> +#include <QtCore/private/qglobal_p.h> #include <QtCore/qstring.h> #include <QtCore/qvector.h> diff --git a/src/qml/common/qqmljssourcelocation_p.h b/src/qml/common/qqmljssourcelocation_p.h index f04e38affd..5c314b1a43 100644 --- a/src/qml/common/qqmljssourcelocation_p.h +++ b/src/qml/common/qqmljssourcelocation_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 QtQml module of the Qt Toolkit. @@ -40,7 +40,7 @@ #ifndef QQMLJSSOURCELOCATION_P_H #define QQMLJSSOURCELOCATION_P_H -#include <QtCore/qglobal.h> +#include <QtCore/private/qglobal_p.h> #include <QtCore/qhashfunctions.h> // diff --git a/src/qml/compiler/qv4util_p.h b/src/qml/compiler/qv4util_p.h index bd9758c1fb..6ee0e56dce 100644 --- a/src/qml/compiler/qv4util_p.h +++ b/src/qml/compiler/qv4util_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 QtQml module of the Qt Toolkit. @@ -51,6 +51,7 @@ // #include <QtCore/QBitArray> +#include <QtCore/private/qglobal_p.h> #include <algorithm> #include <vector> diff --git a/src/qml/debugger/qqmldebugstatesdelegate_p.h b/src/qml/debugger/qqmldebugstatesdelegate_p.h index b2e14873dc..7ab44bf6ba 100644 --- a/src/qml/debugger/qqmldebugstatesdelegate_p.h +++ b/src/qml/debugger/qqmldebugstatesdelegate_p.h @@ -54,6 +54,7 @@ #include <QtQml/qtqmlglobal.h> #include <QtCore/QList> #include <QtCore/QPointer> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/qml/debugger/qqmldebugtranslationprotocol_p.h b/src/qml/debugger/qqmldebugtranslationprotocol_p.h index 70cb2163c8..1821f60521 100644 --- a/src/qml/debugger/qqmldebugtranslationprotocol_p.h +++ b/src/qml/debugger/qqmldebugtranslationprotocol_p.h @@ -54,6 +54,7 @@ #include <QtCore/qurl.h> #include <QtCore/qobjectdefs.h> #include <QtCore/qmetaobject.h> +#include <QtCore/private/qglobal_p.h> #include <tuple> QT_BEGIN_NAMESPACE diff --git a/src/qml/jsruntime/qv4domerrors_p.h b/src/qml/jsruntime/qv4domerrors_p.h index 1842e46a9c..2d5732ab1d 100644 --- a/src/qml/jsruntime/qv4domerrors_p.h +++ b/src/qml/jsruntime/qv4domerrors_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 QtQml 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 // From DOM-Level-3-Core spec diff --git a/src/qml/jsruntime/qv4sqlerrors_p.h b/src/qml/jsruntime/qv4sqlerrors_p.h index 51dcb286de..0f052fc065 100644 --- a/src/qml/jsruntime/qv4sqlerrors_p.h +++ b/src/qml/jsruntime/qv4sqlerrors_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 QtQml 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 #define SQLEXCEPTION_UNKNOWN_ERR 1 diff --git a/src/qml/parser/qqmljsglobal_p.h b/src/qml/parser/qqmljsglobal_p.h index 9eceb7a6ca..cab0b55e6c 100644 --- a/src/qml/parser/qqmljsglobal_p.h +++ b/src/qml/parser/qqmljsglobal_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 QtQml module of the Qt Toolkit. @@ -50,7 +50,7 @@ // We mean it. // -#include <QtCore/qglobal.h> +#include <QtCore/private/qglobal_p.h> #ifndef QT_STATIC # if defined(QT_BUILD_QML_LIB) diff --git a/src/qml/qml/ftw/qbipointer_p.h b/src/qml/qml/ftw/qbipointer_p.h index 781b0a24d5..db272d41f8 100644 --- a/src/qml/qml/ftw/qbipointer_p.h +++ b/src/qml/qml/ftw/qbipointer_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 QtQml 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/qml/qml/ftw/qdoubleendedlist_p.h b/src/qml/qml/ftw/qdoubleendedlist_p.h index 33fe97502d..cf2133843d 100644 --- a/src/qml/qml/ftw/qdoubleendedlist_p.h +++ b/src/qml/qml/ftw/qdoubleendedlist_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/qml/qml/ftw/qfieldlist_p.h b/src/qml/qml/ftw/qfieldlist_p.h index c6553b5fe9..9398e5cd34 100644 --- a/src/qml/qml/ftw/qfieldlist_p.h +++ b/src/qml/qml/ftw/qfieldlist_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 QtQml module of the Qt Toolkit. @@ -51,7 +51,7 @@ // We mean it. // -#include <QtCore/qglobal.h> +#include <QtCore/private/qglobal_p.h> #include <QtCore/qtaggedpointer.h> diff --git a/src/qml/qml/ftw/qfinitestack_p.h b/src/qml/qml/ftw/qfinitestack_p.h index 9a74199137..d0e4296f80 100644 --- a/src/qml/qml/ftw/qfinitestack_p.h +++ b/src/qml/qml/ftw/qfinitestack_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 QtQml 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/qml/qml/ftw/qintrusivelist_p.h b/src/qml/qml/ftw/qintrusivelist_p.h index 40dc45095f..642fb6328c 100644 --- a/src/qml/qml/ftw/qintrusivelist_p.h +++ b/src/qml/qml/ftw/qintrusivelist_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 QtQml 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/qml/qml/ftw/qlazilyallocated_p.h b/src/qml/qml/ftw/qlazilyallocated_p.h index 2bac84afb3..bbd5c3d35c 100644 --- a/src/qml/qml/ftw/qlazilyallocated_p.h +++ b/src/qml/qml/ftw/qlazilyallocated_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 QtQml module of the Qt Toolkit. @@ -51,7 +51,7 @@ // We mean it. // -#include <QtCore/qglobal.h> +#include <QtCore/private/qglobal_p.h> #include <QtCore/qtaggedpointer.h> QT_BEGIN_NAMESPACE diff --git a/src/qml/qml/ftw/qpodvector_p.h b/src/qml/qml/ftw/qpodvector_p.h index b2fb481793..f5e6590459 100644 --- a/src/qml/qml/ftw/qpodvector_p.h +++ b/src/qml/qml/ftw/qpodvector_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 QtQml module of the Qt Toolkit. @@ -51,7 +51,7 @@ // We mean it. // -#include <QtCore/qglobal.h> +#include <QtCore/private/qglobal_p.h> #include <QDebug> QT_BEGIN_NAMESPACE diff --git a/src/qml/qml/ftw/qqmlnullablevalue_p.h b/src/qml/qml/ftw/qqmlnullablevalue_p.h index 899dae457d..db89ad7b91 100644 --- a/src/qml/qml/ftw/qqmlnullablevalue_p.h +++ b/src/qml/qml/ftw/qqmlnullablevalue_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 QtQml 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/qml/qml/ftw/qrecursionwatcher_p.h b/src/qml/qml/ftw/qrecursionwatcher_p.h index 56b714f922..1c8ea16e49 100644 --- a/src/qml/qml/ftw/qrecursionwatcher_p.h +++ b/src/qml/qml/ftw/qrecursionwatcher_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 QtQml 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/qml/qml/ftw/qrecyclepool_p.h b/src/qml/qml/ftw/qrecyclepool_p.h index 3ba488d586..2a7b41a8f4 100644 --- a/src/qml/qml/ftw/qrecyclepool_p.h +++ b/src/qml/qml/ftw/qrecyclepool_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 QtQml 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/qml/qml/qqmlenumvalue_p.h b/src/qml/qml/qqmlenumvalue_p.h index ea0fc244cb..cb4b9c55dd 100644 --- a/src/qml/qml/qqmlenumvalue_p.h +++ b/src/qml/qml/qqmlenumvalue_p.h @@ -52,6 +52,7 @@ // #include <QtCore/qstring.h> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/qml/qml/qqmlloggingcategory_p.h b/src/qml/qml/qqmlloggingcategory_p.h index 0a445b5b34..5ae0e4d3e6 100644 --- a/src/qml/qml/qqmlloggingcategory_p.h +++ b/src/qml/qml/qqmlloggingcategory_p.h @@ -57,6 +57,7 @@ #include <QtQml/qqmlparserstatus.h> #include <QtQml/qqml.h> +#include <QtCore/private/qglobal_p.h> #include <memory> diff --git a/src/qml/qml/qqmlpropertycachemethodarguments_p.h b/src/qml/qml/qqmlpropertycachemethodarguments_p.h index 742df642b1..189aee4af9 100644 --- a/src/qml/qml/qqmlpropertycachemethodarguments_p.h +++ b/src/qml/qml/qqmlpropertycachemethodarguments_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 QtQml module of the Qt Toolkit. @@ -55,6 +55,7 @@ #include <QtCore/qbytearray.h> #include <QtCore/qtaggedpointer.h> #include <QtCore/qmetatype.h> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/qml/qml/qqmlscriptstring_p.h b/src/qml/qml/qqmlscriptstring_p.h index fd8ccd5d53..9933816014 100644 --- a/src/qml/qml/qqmlscriptstring_p.h +++ b/src/qml/qml/qqmlscriptstring_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 QtQml module of the Qt Toolkit. @@ -53,6 +53,7 @@ #include "qqmlscriptstring.h" #include <QtQml/qqmlcontext.h> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/qml/qml/qqmlsourcecoordinate_p.h b/src/qml/qml/qqmlsourcecoordinate_p.h index 55e11fd147..929707ed87 100644 --- a/src/qml/qml/qqmlsourcecoordinate_p.h +++ b/src/qml/qml/qqmlsourcecoordinate_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <QtCore/qglobal.h> +#include <QtCore/private/qglobal_p.h> #include <limits> diff --git a/src/qml/qml/qqmltypeloadernetworkreplyproxy_p.h b/src/qml/qml/qqmltypeloadernetworkreplyproxy_p.h index ed87a2b508..23c6d66b1e 100644 --- a/src/qml/qml/qqmltypeloadernetworkreplyproxy_p.h +++ b/src/qml/qml/qqmltypeloadernetworkreplyproxy_p.h @@ -53,6 +53,7 @@ #include <QtQml/qtqmlglobal.h> #include <QtCore/qobject.h> +#include <QtCore/private/qglobal_p.h> QT_REQUIRE_CONFIG(qml_network); diff --git a/src/qml/qml/qqmltypenotavailable_p.h b/src/qml/qml/qqmltypenotavailable_p.h index dbd37ace2a..16d3bc6c2c 100644 --- a/src/qml/qml/qqmltypenotavailable_p.h +++ b/src/qml/qml/qqmltypenotavailable_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 QtQml module of the Qt Toolkit. @@ -52,6 +52,7 @@ // #include <qqml.h> +#include <private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/qml/qmltc/qqmltcobjectcreationhelper_p.h b/src/qml/qmltc/qqmltcobjectcreationhelper_p.h index 462676c531..e34bb5506a 100644 --- a/src/qml/qmltc/qqmltcobjectcreationhelper_p.h +++ b/src/qml/qmltc/qqmltcobjectcreationhelper_p.h @@ -52,6 +52,7 @@ // #include <QtQml/qqml.h> +#include <QtCore/private/qglobal_p.h> #include <array> diff --git a/src/qmlcompiler/qcoloroutput_p.h b/src/qmlcompiler/qcoloroutput_p.h index 724a5acd4e..608111db48 100644 --- a/src/qmlcompiler/qcoloroutput_p.h +++ b/src/qmlcompiler/qcoloroutput_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 tools applications of the Qt Toolkit. @@ -39,7 +39,7 @@ // // We mean it. -#include <QtCore/qglobal.h> +#include <QtCore/private/qglobal_p.h> #include <QtCore/qscopedpointer.h> #include <QtCore/qstring.h> diff --git a/src/qmlcompiler/qdeferredpointer_p.h b/src/qmlcompiler/qdeferredpointer_p.h index 2da17b3dd9..5c496529ba 100644 --- a/src/qmlcompiler/qdeferredpointer_p.h +++ b/src/qmlcompiler/qdeferredpointer_p.h @@ -39,7 +39,7 @@ // // We mean it. -#include <QtCore/qglobal.h> +#include <QtCore/private/qglobal_p.h> #include <QtCore/qsharedpointer.h> QT_BEGIN_NAMESPACE diff --git a/src/qmlcompiler/qqmljsloadergenerator_p.h b/src/qmlcompiler/qqmljsloadergenerator_p.h index a8f00d30d0..80e086dc64 100644 --- a/src/qmlcompiler/qqmljsloadergenerator_p.h +++ b/src/qmlcompiler/qqmljsloadergenerator_p.h @@ -41,6 +41,7 @@ #include <QtCore/qstring.h> #include <QtCore/qlist.h> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/qmlcompiler/qqmljsresourcefilemapper_p.h b/src/qmlcompiler/qqmljsresourcefilemapper_p.h index 6be1503556..d7eda83b85 100644 --- a/src/qmlcompiler/qqmljsresourcefilemapper_p.h +++ b/src/qmlcompiler/qqmljsresourcefilemapper_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 QtQml module of the Qt Toolkit. @@ -41,6 +41,7 @@ #include <QStringList> #include <QHash> #include <QFile> +#include <private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/qmlcompiler/qqmljsstreamwriter_p.h b/src/qmlcompiler/qqmljsstreamwriter_p.h index 811eba9bfc..9dac2e1318 100644 --- a/src/qmlcompiler/qqmljsstreamwriter_p.h +++ b/src/qmlcompiler/qqmljsstreamwriter_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 tools applications of the Qt Toolkit. @@ -44,6 +44,7 @@ #include <QtCore/QString> #include <QtCore/QScopedPointer> #include <QtCore/QPair> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/qmlcompiler/qresourcerelocater_p.h b/src/qmlcompiler/qresourcerelocater_p.h index 5b75a424e6..9e7eded11f 100644 --- a/src/qmlcompiler/qresourcerelocater_p.h +++ b/src/qmlcompiler/qresourcerelocater_p.h @@ -40,6 +40,7 @@ // We mean it. #include <QtCore/qstring.h> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/qmldebug/qqmldebugclient_p.h b/src/qmldebug/qqmldebugclient_p.h index 469b65d4a9..2b9a0298b7 100644 --- a/src/qmldebug/qqmldebugclient_p.h +++ b/src/qmldebug/qqmldebugclient_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 QtQml module of the Qt Toolkit. @@ -41,6 +41,7 @@ #define QQMLDEBUGCLIENT_P_H #include <QtCore/qobject.h> +#include <QtCore/private/qglobal_p.h> // // W A R N I N G diff --git a/src/qmldebug/qqmldebugconnection_p.h b/src/qmldebug/qqmldebugconnection_p.h index 5abdd2943b..846a9580d1 100644 --- a/src/qmldebug/qqmldebugconnection_p.h +++ b/src/qmldebug/qqmldebugconnection_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 QtQml module of the Qt Toolkit. @@ -42,6 +42,7 @@ #include <QtCore/qobject.h> #include <QtNetwork/qabstractsocket.h> +#include <QtCore/private/qglobal_p.h> // // W A R N I N G diff --git a/src/qmldebug/qqmlprofilerclientdefinitions_p.h b/src/qmldebug/qqmlprofilerclientdefinitions_p.h index be1c6318af..12b00cbb67 100644 --- a/src/qmldebug/qqmlprofilerclientdefinitions_p.h +++ b/src/qmldebug/qqmlprofilerclientdefinitions_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/qmldebug/qqmlprofilereventlocation_p.h b/src/qmldebug/qqmlprofilereventlocation_p.h index 292d9c40ac..881c8cad4c 100644 --- a/src/qmldebug/qqmlprofilereventlocation_p.h +++ b/src/qmldebug/qqmlprofilereventlocation_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 QtQml module of the Qt Toolkit. @@ -43,6 +43,7 @@ #include <QtCore/qstring.h> #include <QtCore/qhash.h> #include <QtCore/qdatastream.h> +#include <QtCore/private/qglobal_p.h> // // W A R N I N G diff --git a/src/qmldom/qqmldom_fwd_p.h b/src/qmldom/qqmldom_fwd_p.h index 7b21489eb5..b6464227ad 100644 --- a/src/qmldom/qqmldom_fwd_p.h +++ b/src/qmldom/qqmldom_fwd_p.h @@ -50,6 +50,7 @@ // #include "qqmldom_global.h" +#include "private/qglobal_p.h" QT_BEGIN_NAMESPACE diff --git a/src/qmldom/qqmldomconstants_p.h b/src/qmldom/qqmldomconstants_p.h index 0156509399..a99d4ee53b 100644 --- a/src/qmldom/qqmldomconstants_p.h +++ b/src/qmldom/qqmldomconstants_p.h @@ -53,6 +53,7 @@ #include <QtCore/QObject> #include <QtCore/QMetaObject> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/qmldom/qqmldomfunctionref_p.h b/src/qmldom/qqmldomfunctionref_p.h index b0bbc70a54..44ba96231f 100644 --- a/src/qmldom/qqmldomfunctionref_p.h +++ b/src/qmldom/qqmldomfunctionref_p.h @@ -49,6 +49,8 @@ // We mean it. // +#include <QtCore/private/qglobal_p.h> + #include <functional> // function_ref has been proposed for the C++20 standard, see // http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2018/p0792r2.html diff --git a/src/qmlmodels/qqmllistaccessor_p.h b/src/qmlmodels/qqmllistaccessor_p.h index 5e7df4b710..b3b344cd47 100644 --- a/src/qmlmodels/qqmllistaccessor_p.h +++ b/src/qmlmodels/qqmllistaccessor_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 QtQml module of the Qt Toolkit. @@ -52,6 +52,7 @@ // #include <QtCore/QVariant> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/qmlmodels/qqmlmodelindexvaluetype_p.h b/src/qmlmodels/qqmlmodelindexvaluetype_p.h index 2c37d91c71..0ca02dff29 100644 --- a/src/qmlmodels/qqmlmodelindexvaluetype_p.h +++ b/src/qmlmodels/qqmlmodelindexvaluetype_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 QtQml module of the Qt Toolkit. @@ -54,6 +54,7 @@ #include <QtCore/qabstractitemmodel.h> #include <QtCore/qitemselectionmodel.h> #include <QtQml/qqml.h> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/qmltest/qtestoptions_p.h b/src/qmltest/qtestoptions_p.h index 7be5c88590..e8d8caada9 100644 --- a/src/qmltest/qtestoptions_p.h +++ b/src/qmltest/qtestoptions_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 @@ #if QT_VERSION < QT_VERSION_CHECK(5, 11, 0) # include <QtTest/qtest_global.h> +# include <QtCore/private/qglobal_p.h> #else # include <QtTest/qttestglobal.h> #endif diff --git a/src/qmltest/quicktestglobal_p.h b/src/qmltest/quicktestglobal_p.h index 0327f73b4c..8f3b183eb6 100644 --- a/src/qmltest/quicktestglobal_p.h +++ b/src/qmltest/quicktestglobal_p.h @@ -52,6 +52,7 @@ // #include "quicktestglobal.h" +#include "private/qglobal_p.h" #define Q_QUICK_TEST_PRIVATE_EXPORT Q_QUICK_TEST_EXPORT diff --git a/src/quick/accessible/qaccessiblequickview_p.h b/src/quick/accessible/qaccessiblequickview_p.h index 8baa01330c..62a2d7f2a7 100644 --- a/src/quick/accessible/qaccessiblequickview_p.h +++ b/src/quick/accessible/qaccessiblequickview_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 QtQuick module of the Qt Toolkit. @@ -53,6 +53,7 @@ #include <QtGui/qaccessibleobject.h> #include <QtQuick/qquickwindow.h> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick/accessible/qquickaccessiblefactory_p.h b/src/quick/accessible/qquickaccessiblefactory_p.h index ab8eb12ca4..b1b67a3d35 100644 --- a/src/quick/accessible/qquickaccessiblefactory_p.h +++ b/src/quick/accessible/qquickaccessiblefactory_p.h @@ -52,6 +52,7 @@ // #include <QtGui/qaccessible.h> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE #if QT_CONFIG(accessibility) diff --git a/src/quick/designer/qquickdesignersupport_p.h b/src/quick/designer/qquickdesignersupport_p.h index 6d2da6aa35..3675f094ab 100644 --- a/src/quick/designer/qquickdesignersupport_p.h +++ b/src/quick/designer/qquickdesignersupport_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 QtQuick module of the Qt Toolkit. @@ -55,6 +55,7 @@ #include <QtCore/QtGlobal> #include <QtCore/QHash> #include <QtCore/QRectF> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick/items/qquickgraphicsinfo_p.h b/src/quick/items/qquickgraphicsinfo_p.h index 192500d056..305b9f7ebd 100644 --- a/src/quick/items/qquickgraphicsinfo_p.h +++ b/src/quick/items/qquickgraphicsinfo_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 QtQuick module of the Qt Toolkit. @@ -56,6 +56,7 @@ #include <QtQml/qqml.h> #include <QtGui/qsurfaceformat.h> #include <QtQuick/qsgrendererinterface.h> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick/items/qquickitemchangelistener_p.h b/src/quick/items/qquickitemchangelistener_p.h index 91e2d69cc0..d0afe41496 100644 --- a/src/quick/items/qquickitemchangelistener_p.h +++ b/src/quick/items/qquickitemchangelistener_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 QtQuick 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/quick/items/qquickselectable_p.h b/src/quick/items/qquickselectable_p.h index 6005ce1145..67b12fcbbc 100644 --- a/src/quick/items/qquickselectable_p.h +++ b/src/quick/items/qquickselectable_p.h @@ -52,6 +52,7 @@ // #include <QtQuick/qquickitem.h> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick/items/qquicktextdocument_p.h b/src/quick/items/qquicktextdocument_p.h index 9c5152d442..62ad7b99a0 100644 --- a/src/quick/items/qquicktextdocument_p.h +++ b/src/quick/items/qquicktextdocument_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 QtQuick module of the Qt Toolkit. @@ -57,6 +57,7 @@ #include <QtGui/qtextdocument.h> #include <QtGui/qabstracttextdocumentlayout.h> #include <QtGui/qtextlayout.h> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick/items/qquicktextutil_p.h b/src/quick/items/qquicktextutil_p.h index bad5e738a8..94e3b99d83 100644 --- a/src/quick/items/qquicktextutil_p.h +++ b/src/quick/items/qquicktextutil_p.h @@ -55,6 +55,7 @@ #include <QtQml/qqmlincubator.h> #include <QtQuick/qquickitem.h> #include <QtQuick/qquickwindow.h> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick/scenegraph/adaptations/software/qsgsoftwarepublicnodes_p.h b/src/quick/scenegraph/adaptations/software/qsgsoftwarepublicnodes_p.h index f005413c5f..8feb832e54 100644 --- a/src/quick/scenegraph/adaptations/software/qsgsoftwarepublicnodes_p.h +++ b/src/quick/scenegraph/adaptations/software/qsgsoftwarepublicnodes_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 QtQuick module of the Qt Toolkit. @@ -44,6 +44,7 @@ #include <QtQuick/qsgimagenode.h> #include <QtQuick/qsgninepatchnode.h> #include <QtGui/qpixmap.h> +#include <QtCore/private/qglobal_p.h> // // W A R N I N G diff --git a/src/quick/scenegraph/coreapi/qsggeometry_p.h b/src/quick/scenegraph/coreapi/qsggeometry_p.h index a80be662df..1d083de285 100644 --- a/src/quick/scenegraph/coreapi/qsggeometry_p.h +++ b/src/quick/scenegraph/coreapi/qsggeometry_p.h @@ -52,6 +52,7 @@ // #include "qsggeometry.h" +#include "private/qglobal_p.h" QT_BEGIN_NAMESPACE diff --git a/src/quick/scenegraph/coreapi/qsgnode_p.h b/src/quick/scenegraph/coreapi/qsgnode_p.h index f81128f51a..e53ba42fa7 100644 --- a/src/quick/scenegraph/coreapi/qsgnode_p.h +++ b/src/quick/scenegraph/coreapi/qsgnode_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <qglobal.h> +#include <private/qglobal_p.h> #include "qsgnode.h" diff --git a/src/quick/scenegraph/util/qsgdefaultrectanglenode_p.h b/src/quick/scenegraph/util/qsgdefaultrectanglenode_p.h index 965aa8dabb..a3b794c808 100644 --- a/src/quick/scenegraph/util/qsgdefaultrectanglenode_p.h +++ b/src/quick/scenegraph/util/qsgdefaultrectanglenode_p.h @@ -54,6 +54,7 @@ #include <QtGui/qcolor.h> #include <QtQuick/qsgrectanglenode.h> #include <QtQuick/qsgvertexcolormaterial.h> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick/scenegraph/util/qsgtexturereader_p.h b/src/quick/scenegraph/util/qsgtexturereader_p.h index 20c17fce50..04842adc5b 100644 --- a/src/quick/scenegraph/util/qsgtexturereader_p.h +++ b/src/quick/scenegraph/util/qsgtexturereader_p.h @@ -53,6 +53,7 @@ #include <QString> #include <QFileInfo> +#include <private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick/util/qminimalflatset_p.h b/src/quick/util/qminimalflatset_p.h index 6544d67d3d..431b261dc0 100644 --- a/src/quick/util/qminimalflatset_p.h +++ b/src/quick/util/qminimalflatset_p.h @@ -54,6 +54,7 @@ #include <QtQuick/qtquickglobal.h> #include <QtCore/qcontainerfwd.h> +#include <QtCore/private/qglobal_p.h> //#define QMINIMAL_FLAT_SET_DEBUG #ifdef QMINIMAL_FLAT_SET_DEBUG diff --git a/src/quick/util/qquickshortcut_p.h b/src/quick/util/qquickshortcut_p.h index 67dab928b7..700f8a9c72 100644 --- a/src/quick/util/qquickshortcut_p.h +++ b/src/quick/util/qquickshortcut_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 QtQuick module of the Qt Toolkit. @@ -57,6 +57,7 @@ #include <QtGui/qkeysequence.h> #include <QtQml/qqmlparserstatus.h> #include <QtQml/qqml.h> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quickcontrols2/basic/impl/qquickbasicbusyindicator_p.h b/src/quickcontrols2/basic/impl/qquickbasicbusyindicator_p.h index e1ab64157a..bef0612241 100644 --- a/src/quickcontrols2/basic/impl/qquickbasicbusyindicator_p.h +++ b/src/quickcontrols2/basic/impl/qquickbasicbusyindicator_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 Qt Quick Controls 2 module of the Qt Toolkit. @@ -53,6 +53,7 @@ #include <QtQuick/qquickitem.h> #include <QtGui/qcolor.h> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quickcontrols2/basic/impl/qquickbasicdial_p.h b/src/quickcontrols2/basic/impl/qquickbasicdial_p.h index 640672ba12..8911f99f68 100644 --- a/src/quickcontrols2/basic/impl/qquickbasicdial_p.h +++ b/src/quickcontrols2/basic/impl/qquickbasicdial_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 Qt Quick Controls 2 module of the Qt Toolkit. @@ -53,6 +53,7 @@ #include <QtGui/qcolor.h> #include <QtQuick/qquickpainteditem.h> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quickcontrols2/basic/impl/qquickbasicprogressbar_p.h b/src/quickcontrols2/basic/impl/qquickbasicprogressbar_p.h index 358f75c0e8..663485d474 100644 --- a/src/quickcontrols2/basic/impl/qquickbasicprogressbar_p.h +++ b/src/quickcontrols2/basic/impl/qquickbasicprogressbar_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 Qt Quick Controls 2 module of the Qt Toolkit. @@ -53,6 +53,7 @@ #include <QtQuick/qquickitem.h> #include <QtGui/qcolor.h> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quickcontrols2/basic/qquickbasicstyle_p.h b/src/quickcontrols2/basic/qquickbasicstyle_p.h index 4fab698282..7e23e30fd9 100644 --- a/src/quickcontrols2/basic/qquickbasicstyle_p.h +++ b/src/quickcontrols2/basic/qquickbasicstyle_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 Qt Quick Controls 2 module of the Qt Toolkit. @@ -54,6 +54,7 @@ #include <QtCore/qobject.h> #include <QtGui/qcolor.h> #include <QtQml/qqml.h> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quickcontrols2/basic/qquickbasictheme_p.h b/src/quickcontrols2/basic/qquickbasictheme_p.h index d70c2cc81d..d6860a92ed 100644 --- a/src/quickcontrols2/basic/qquickbasictheme_p.h +++ b/src/quickcontrols2/basic/qquickbasictheme_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 Qt Quick Controls 2 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/quickcontrols2/fusion/impl/qquickfusionbusyindicator_p.h b/src/quickcontrols2/fusion/impl/qquickfusionbusyindicator_p.h index 9370dfd6fb..7dcdf6e006 100644 --- a/src/quickcontrols2/fusion/impl/qquickfusionbusyindicator_p.h +++ b/src/quickcontrols2/fusion/impl/qquickfusionbusyindicator_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 Qt Quick Controls 2 module of the Qt Toolkit. @@ -53,6 +53,7 @@ #include <QtGui/qcolor.h> #include <QtQuick/qquickpainteditem.h> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quickcontrols2/fusion/impl/qquickfusiondial_p.h b/src/quickcontrols2/fusion/impl/qquickfusiondial_p.h index cd00d7d88d..d69a1d2e23 100644 --- a/src/quickcontrols2/fusion/impl/qquickfusiondial_p.h +++ b/src/quickcontrols2/fusion/impl/qquickfusiondial_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 Qt Quick Controls 2 module of the Qt Toolkit. @@ -52,6 +52,7 @@ // #include <QtQuick/qquickpainteditem.h> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quickcontrols2/fusion/impl/qquickfusionknob_p.h b/src/quickcontrols2/fusion/impl/qquickfusionknob_p.h index 311aa0b089..cea18273c2 100644 --- a/src/quickcontrols2/fusion/impl/qquickfusionknob_p.h +++ b/src/quickcontrols2/fusion/impl/qquickfusionknob_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 Qt Quick Controls 2 module of the Qt Toolkit. @@ -52,6 +52,7 @@ // #include <QtQuick/qquickpainteditem.h> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quickcontrols2/fusion/qquickfusiontheme_p.h b/src/quickcontrols2/fusion/qquickfusiontheme_p.h index 5e3ae6dbce..418d528209 100644 --- a/src/quickcontrols2/fusion/qquickfusiontheme_p.h +++ b/src/quickcontrols2/fusion/qquickfusiontheme_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 Qt Quick Controls 2 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/quickcontrols2/imagine/qquickimaginetheme_p.h b/src/quickcontrols2/imagine/qquickimaginetheme_p.h index a14c963ddd..4486fffa7a 100644 --- a/src/quickcontrols2/imagine/qquickimaginetheme_p.h +++ b/src/quickcontrols2/imagine/qquickimaginetheme_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 Qt Quick Controls 2 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/quickcontrols2/material/impl/qquickmaterialbusyindicator_p.h b/src/quickcontrols2/material/impl/qquickmaterialbusyindicator_p.h index 42584a7900..621fa7cfe5 100644 --- a/src/quickcontrols2/material/impl/qquickmaterialbusyindicator_p.h +++ b/src/quickcontrols2/material/impl/qquickmaterialbusyindicator_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 Qt Quick Controls 2 module of the Qt Toolkit. @@ -53,6 +53,7 @@ #include <QtGui/qcolor.h> #include <QtQuick/qquickitem.h> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quickcontrols2/material/impl/qquickmaterialprogressbar_p.h b/src/quickcontrols2/material/impl/qquickmaterialprogressbar_p.h index 2d0ba13313..c607d62b77 100644 --- a/src/quickcontrols2/material/impl/qquickmaterialprogressbar_p.h +++ b/src/quickcontrols2/material/impl/qquickmaterialprogressbar_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 Qt Quick Controls 2 module of the Qt Toolkit. @@ -53,6 +53,7 @@ #include <QtGui/qcolor.h> #include <QtQuick/qquickitem.h> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quickcontrols2/material/impl/qquickmaterialripple_p.h b/src/quickcontrols2/material/impl/qquickmaterialripple_p.h index 93b183df69..fd87bec106 100644 --- a/src/quickcontrols2/material/impl/qquickmaterialripple_p.h +++ b/src/quickcontrols2/material/impl/qquickmaterialripple_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 Qt Quick Controls 2 module of the Qt Toolkit. @@ -53,6 +53,7 @@ #include <QtQuick/qquickitem.h> #include <QtGui/qcolor.h> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quickcontrols2/material/qquickmaterialtheme_p.h b/src/quickcontrols2/material/qquickmaterialtheme_p.h index e6aa7ac438..417793675f 100644 --- a/src/quickcontrols2/material/qquickmaterialtheme_p.h +++ b/src/quickcontrols2/material/qquickmaterialtheme_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 Qt Quick Controls 2 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/quickcontrols2/qquickstyle_p.h b/src/quickcontrols2/qquickstyle_p.h index 90986faff3..d3f6e10504 100644 --- a/src/quickcontrols2/qquickstyle_p.h +++ b/src/quickcontrols2/qquickstyle_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 Qt Quick Controls 2 module of the Qt Toolkit. @@ -53,6 +53,7 @@ #include <QtCore/qsharedpointer.h> #include <QtQuickControls2/qtquickcontrols2global.h> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quickcontrols2/qquickstyleplugin_p.h b/src/quickcontrols2/qquickstyleplugin_p.h index 79d5e94d32..c4b20ce5f7 100644 --- a/src/quickcontrols2/qquickstyleplugin_p.h +++ b/src/quickcontrols2/qquickstyleplugin_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 Qt Quick Controls 2 module of the Qt Toolkit. @@ -53,6 +53,7 @@ #include <QtQml/qqmlextensionplugin.h> #include <QtQuickControls2/qtquickcontrols2global.h> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quickcontrols2/universal/impl/qquickuniversalbusyindicator_p.h b/src/quickcontrols2/universal/impl/qquickuniversalbusyindicator_p.h index f8cd4ce588..95a554615f 100644 --- a/src/quickcontrols2/universal/impl/qquickuniversalbusyindicator_p.h +++ b/src/quickcontrols2/universal/impl/qquickuniversalbusyindicator_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 Qt Quick Controls 2 module of the Qt Toolkit. @@ -53,6 +53,7 @@ #include <QtGui/qcolor.h> #include <QtQuick/qquickitem.h> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quickcontrols2/universal/impl/qquickuniversalfocusrectangle_p.h b/src/quickcontrols2/universal/impl/qquickuniversalfocusrectangle_p.h index 31f3f8d2a0..a2c535cc73 100644 --- a/src/quickcontrols2/universal/impl/qquickuniversalfocusrectangle_p.h +++ b/src/quickcontrols2/universal/impl/qquickuniversalfocusrectangle_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 Qt Quick Controls 2 module of the Qt Toolkit. @@ -52,6 +52,7 @@ // #include <QtQuick/qquickpainteditem.h> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quickcontrols2/universal/impl/qquickuniversalprogressbar_p.h b/src/quickcontrols2/universal/impl/qquickuniversalprogressbar_p.h index 4779750bae..d58e393b7c 100644 --- a/src/quickcontrols2/universal/impl/qquickuniversalprogressbar_p.h +++ b/src/quickcontrols2/universal/impl/qquickuniversalprogressbar_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 Qt Quick Controls 2 module of the Qt Toolkit. @@ -53,6 +53,7 @@ #include <QtGui/qcolor.h> #include <QtQuick/qquickitem.h> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quickcontrols2/universal/qquickuniversaltheme_p.h b/src/quickcontrols2/universal/qquickuniversaltheme_p.h index 8e80285356..dd78c4b2e7 100644 --- a/src/quickcontrols2/universal/qquickuniversaltheme_p.h +++ b/src/quickcontrols2/universal/qquickuniversaltheme_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 Qt Quick Controls 2 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/quickdialogs2/quickdialogs2utils/qquickdialogtype_p.h b/src/quickdialogs2/quickdialogs2utils/qquickdialogtype_p.h index 4cfdcc6ad3..9d7c346979 100644 --- a/src/quickdialogs2/quickdialogs2utils/qquickdialogtype_p.h +++ b/src/quickdialogs2/quickdialogs2utils/qquickdialogtype_p.h @@ -52,6 +52,7 @@ // #include <QtCore/qnamespace.h> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quicknativestyle/qstyle/mac/qquickmacstyle_mac_p.h b/src/quicknativestyle/qstyle/mac/qquickmacstyle_mac_p.h index 634f375575..072095f82a 100644 --- a/src/quicknativestyle/qstyle/mac/qquickmacstyle_mac_p.h +++ b/src/quicknativestyle/qstyle/mac/qquickmacstyle_mac_p.h @@ -52,6 +52,7 @@ // #include "qquickcommonstyle.h" +#include "private/qglobal_p.h" #define QQC2_NAMESPACE QQC2 diff --git a/src/quicknativestyle/qstyle/qquickcommonstylepixmaps_p.h b/src/quicknativestyle/qstyle/qquickcommonstylepixmaps_p.h index 7b1b3db2ed..47b5940ce0 100644 --- a/src/quicknativestyle/qstyle/qquickcommonstylepixmaps_p.h +++ b/src/quicknativestyle/qstyle/qquickcommonstylepixmaps_p.h @@ -50,6 +50,8 @@ // We mean it. // +#include <QtCore/private/qglobal_p.h> + QT_BEGIN_NAMESPACE namespace QQC2 { diff --git a/src/quicknativestyle/qstyle/qquickstylehelper_p.h b/src/quicknativestyle/qstyle/qquickstylehelper_p.h index 6bdd44d676..bf2fd42557 100644 --- a/src/quicknativestyle/qstyle/qquickstylehelper_p.h +++ b/src/quicknativestyle/qstyle/qquickstylehelper_p.h @@ -42,6 +42,7 @@ #include <QtGui/qpaintdevice.h> #include <QtGui/qpolygon.h> #include <QtCore/qstringbuilder.h> +#include <QtCore/private/qglobal_p.h> #if QT_CONFIG(accessibility) #include <QtGui/qaccessible.h> #endif diff --git a/src/quicknativestyle/qstyle/windows/qquickwindowsstyle_p.h b/src/quicknativestyle/qstyle/windows/qquickwindowsstyle_p.h index 92926b7129..c451c7706d 100644 --- a/src/quicknativestyle/qstyle/windows/qquickwindowsstyle_p.h +++ b/src/quicknativestyle/qstyle/windows/qquickwindowsstyle_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 QtWidgets module of the Qt Toolkit. @@ -52,6 +52,7 @@ // #include "qquickcommonstyle.h" +#include "private/qglobal_p.h" QT_BEGIN_NAMESPACE diff --git a/src/quicktemplates2/qquickcalendar_p.h b/src/quicktemplates2/qquickcalendar_p.h index 866b45eaf3..158550a7b9 100644 --- a/src/quicktemplates2/qquickcalendar_p.h +++ b/src/quicktemplates2/qquickcalendar_p.h @@ -54,6 +54,7 @@ #include <QtCore/qobject.h> #include <QtCore/qdatetime.h> #include <QtQml/qqml.h> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quicktemplates2/qquickcalendarmodel_p.h b/src/quicktemplates2/qquickcalendarmodel_p.h index e4eb39868d..7017ac69c0 100644 --- a/src/quicktemplates2/qquickcalendarmodel_p.h +++ b/src/quicktemplates2/qquickcalendarmodel_p.h @@ -55,6 +55,7 @@ #include <QtCore/qdatetime.h> #include <QtQml/qqmlparserstatus.h> #include <QtQml/qqml.h> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quicktemplates2/qquickdayofweekmodel_p.h b/src/quicktemplates2/qquickdayofweekmodel_p.h index 4d1621d4d2..e5d665779d 100644 --- a/src/quicktemplates2/qquickdayofweekmodel_p.h +++ b/src/quicktemplates2/qquickdayofweekmodel_p.h @@ -54,6 +54,7 @@ #include <QtCore/qabstractitemmodel.h> #include <QtCore/qlocale.h> #include <QtQml/qqml.h> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quicktemplates2/qquickmonthmodel_p.h b/src/quicktemplates2/qquickmonthmodel_p.h index ffbfb8b0cb..7151905b88 100644 --- a/src/quicktemplates2/qquickmonthmodel_p.h +++ b/src/quicktemplates2/qquickmonthmodel_p.h @@ -55,6 +55,7 @@ #include <QtCore/qdatetime.h> #include <QtCore/qlocale.h> #include <QtQml/qqml.h> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quicktemplates2/qquickpresshandler_p_p.h b/src/quicktemplates2/qquickpresshandler_p_p.h index a3d66b3539..14f33c27f0 100644 --- a/src/quicktemplates2/qquickpresshandler_p_p.h +++ b/src/quicktemplates2/qquickpresshandler_p_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 Qt Quick Templates 2 module of the Qt Toolkit. @@ -53,6 +53,7 @@ #include <QtCore/qpoint.h> #include <QtCore/qbasictimer.h> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quicktemplates2/qquickvelocitycalculator_p_p.h b/src/quicktemplates2/qquickvelocitycalculator_p_p.h index 4f365b531f..5c610f6ea0 100644 --- a/src/quicktemplates2/qquickvelocitycalculator_p_p.h +++ b/src/quicktemplates2/qquickvelocitycalculator_p_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 Qt Quick Templates 2 module of the Qt Toolkit. @@ -53,6 +53,7 @@ #include <QtCore/qpoint.h> #include <QtCore/qelapsedtimer.h> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quicktemplates2/qquickweeknumbermodel_p.h b/src/quicktemplates2/qquickweeknumbermodel_p.h index 0dc3e4896b..07f2f7ca8f 100644 --- a/src/quicktemplates2/qquickweeknumbermodel_p.h +++ b/src/quicktemplates2/qquickweeknumbermodel_p.h @@ -54,6 +54,7 @@ #include <QtCore/qabstractitemmodel.h> #include <QtCore/qlocale.h> #include <QtQml/qqml.h> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quicktestutils/qml/platforminputcontext_p.h b/src/quicktestutils/qml/platforminputcontext_p.h index 2f75767409..ce8f64b4cf 100644 --- a/src/quicktestutils/qml/platforminputcontext_p.h +++ b/src/quicktestutils/qml/platforminputcontext_p.h @@ -42,6 +42,7 @@ #include <qpa/qplatforminputcontext.h> #include <QtGui/QInputMethod> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quicktestutils/qml/platformquirks_p.h b/src/quicktestutils/qml/platformquirks_p.h index 16aa160d7c..fde7a743d7 100644 --- a/src/quicktestutils/qml/platformquirks_p.h +++ b/src/quicktestutils/qml/platformquirks_p.h @@ -40,7 +40,7 @@ // We mean it. // -#include <qglobal.h> +#include <private/qglobal_p.h> #ifdef Q_OS_OSX #include <Carbon/Carbon.h> diff --git a/src/quicktestutils/qml/qmlutils_p.h b/src/quicktestutils/qml/qmlutils_p.h index 8c959b50e7..aa2ddfe76d 100644 --- a/src/quicktestutils/qml/qmlutils_p.h +++ b/src/quicktestutils/qml/qmlutils_p.h @@ -46,6 +46,7 @@ #include <QtCore/QCoreApplication> #include <QtCore/QStringList> #include <QtTest/QTest> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quicktestutils/qml/testhttpserver_p.h b/src/quicktestutils/qml/testhttpserver_p.h index db99b348ca..ff242febf4 100644 --- a/src/quicktestutils/qml/testhttpserver_p.h +++ b/src/quicktestutils/qml/testhttpserver_p.h @@ -46,6 +46,7 @@ #include <QThread> #include <QMutex> #include <QWaitCondition> +#include <private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quicktestutils/quick/geometrytestutils_p.h b/src/quicktestutils/quick/geometrytestutils_p.h index 867dddeda3..77dc7ae2f2 100644 --- a/src/quicktestutils/quick/geometrytestutils_p.h +++ b/src/quicktestutils/quick/geometrytestutils_p.h @@ -43,6 +43,7 @@ #include <QObject> #include <QVector> #include <QSize> +#include <private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quicktestutils/quick/viewtestutils_p.h b/src/quicktestutils/quick/viewtestutils_p.h index 47026c86c0..0916c94183 100644 --- a/src/quicktestutils/quick/viewtestutils_p.h +++ b/src/quicktestutils/quick/viewtestutils_p.h @@ -43,6 +43,7 @@ #include <QtCore/QAbstractListModel> #include <QtQml/QQmlExpression> #include <QtQuick/QQuickItem> +#include <QtCore/private/qglobal_p.h> QT_FORWARD_DECLARE_CLASS(QQuickView) QT_FORWARD_DECLARE_CLASS(QQuickItemViewPrivate) diff --git a/src/quickwidgets/qaccessiblequickwidgetfactory_p.h b/src/quickwidgets/qaccessiblequickwidgetfactory_p.h index 8c63b09f81..ad498f275d 100644 --- a/src/quickwidgets/qaccessiblequickwidgetfactory_p.h +++ b/src/quickwidgets/qaccessiblequickwidgetfactory_p.h @@ -38,6 +38,7 @@ ****************************************************************************/ #include <QtGui/qaccessible.h> +#include <QtCore/private/qglobal_p.h> #ifndef QACCESSIBLEQUICKWIDGETFACTORY_H #define QACCESSIBLEQUICKWIDGETFACTORY_H diff --git a/tests/auto/quickcontrols2/snippets/CMakeLists.txt b/tests/auto/quickcontrols2/snippets/CMakeLists.txt index ce76c4fbc5..3d856c6c84 100644 --- a/tests/auto/quickcontrols2/snippets/CMakeLists.txt +++ b/tests/auto/quickcontrols2/snippets/CMakeLists.txt @@ -16,6 +16,7 @@ qt_internal_add_test(tst_snippets DEFINES QQC2_SNIPPETS_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2/doc/snippets\\\" PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui Qt::Quick Qt::QuickControls2 |