diff options
Diffstat (limited to 'src/quickcontrols2')
20 files changed, 40 insertions, 25 deletions
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 |