diff options
Diffstat (limited to 'src/quick')
-rw-r--r-- | src/quick/accessible/qaccessiblequickview_p.h | 3 | ||||
-rw-r--r-- | src/quick/accessible/qquickaccessiblefactory_p.h | 1 | ||||
-rw-r--r-- | src/quick/designer/qquickdesignersupport_p.h | 3 | ||||
-rw-r--r-- | src/quick/items/qquickgraphicsinfo_p.h | 3 | ||||
-rw-r--r-- | src/quick/items/qquickitemchangelistener_p.h | 4 | ||||
-rw-r--r-- | src/quick/items/qquickselectable_p.h | 1 | ||||
-rw-r--r-- | src/quick/items/qquicktextdocument_p.h | 3 | ||||
-rw-r--r-- | src/quick/items/qquicktextutil_p.h | 1 | ||||
-rw-r--r-- | src/quick/scenegraph/adaptations/software/qsgsoftwarepublicnodes_p.h | 3 | ||||
-rw-r--r-- | src/quick/scenegraph/coreapi/qsggeometry_p.h | 1 | ||||
-rw-r--r-- | src/quick/scenegraph/coreapi/qsgnode_p.h | 2 | ||||
-rw-r--r-- | src/quick/scenegraph/util/qsgdefaultrectanglenode_p.h | 1 | ||||
-rw-r--r-- | src/quick/scenegraph/util/qsgtexturereader_p.h | 1 | ||||
-rw-r--r-- | src/quick/util/qminimalflatset_p.h | 1 | ||||
-rw-r--r-- | src/quick/util/qquickshortcut_p.h | 3 |
15 files changed, 22 insertions, 9 deletions
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 |