diff options
25 files changed, 50 insertions, 25 deletions
diff --git a/src/location/declarativemaps/error_messages_p.h b/src/location/declarativemaps/error_messages_p.h index 93ac931b..3245d635 100644 --- a/src/location/declarativemaps/error_messages_p.h +++ b/src/location/declarativemaps/error_messages_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtLocation module of the Qt Toolkit. @@ -52,7 +52,7 @@ // -#include <QtCore/qglobal.h> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/location/declarativeplaces/qdeclarativeperiod_p.h b/src/location/declarativeplaces/qdeclarativeperiod_p.h index 4c433303..3ed594dd 100644 --- a/src/location/declarativeplaces/qdeclarativeperiod_p.h +++ b/src/location/declarativeplaces/qdeclarativeperiod_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtLocation module of the Qt Toolkit. @@ -55,6 +55,7 @@ #include <QtQml/qqml.h> #include <QObject> +#include <private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/location/maps/qcache3q_p.h b/src/location/maps/qcache3q_p.h index 23df7aa7..5658972b 100644 --- a/src/location/maps/qcache3q_p.h +++ b/src/location/maps/qcache3q_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -54,6 +54,7 @@ #include <QtCore/qcache.h> #include <QtCore/qsharedpointer.h> #include <QDebug> +#include <private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/location/maps/qgeocodingmanager_p.h b/src/location/maps/qgeocodingmanager_p.h index 6a00b5c6..de63d043 100644 --- a/src/location/maps/qgeocodingmanager_p.h +++ b/src/location/maps/qgeocodingmanager_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtLocation module of the Qt Toolkit. @@ -56,6 +56,7 @@ #include "qgeocodereply.h" #include <QList> +#include <private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/location/maps/qgeocodingmanagerengine_p.h b/src/location/maps/qgeocodingmanagerengine_p.h index 86e0897a..8bbc182b 100644 --- a/src/location/maps/qgeocodingmanagerengine_p.h +++ b/src/location/maps/qgeocodingmanagerengine_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtLocation module of the Qt Toolkit. @@ -55,6 +55,7 @@ #include <QList> #include <QLocale> +#include <private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/location/maps/qgeomappingmanager_p_p.h b/src/location/maps/qgeomappingmanager_p_p.h index 50f52d4c..f8ec379d 100644 --- a/src/location/maps/qgeomappingmanager_p_p.h +++ b/src/location/maps/qgeomappingmanager_p_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtLocation module of the Qt Toolkit. @@ -56,6 +56,7 @@ #include <QHash> #include <QSet> #include <QThread> +#include <private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/location/maps/qgeoroutereply_p.h b/src/location/maps/qgeoroutereply_p.h index 24504c39..6b069a51 100644 --- a/src/location/maps/qgeoroutereply_p.h +++ b/src/location/maps/qgeoroutereply_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtLocation module of the Qt Toolkit. @@ -55,6 +55,7 @@ #include "qgeoroutereply.h" #include <QList> +#include <private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/location/maps/qgeorouterequest_p.h b/src/location/maps/qgeorouterequest_p.h index 409409a2..0f29ccac 100644 --- a/src/location/maps/qgeorouterequest_p.h +++ b/src/location/maps/qgeorouterequest_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtLocation module of the Qt Toolkit. @@ -58,6 +58,7 @@ #include <QDateTime> #include <QMap> #include <QVariantMap> +#include <private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/location/maps/qgeoroutingmanager_p.h b/src/location/maps/qgeoroutingmanager_p.h index e39a86d2..16ff6350 100644 --- a/src/location/maps/qgeoroutingmanager_p.h +++ b/src/location/maps/qgeoroutingmanager_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtLocation module of the Qt Toolkit. @@ -51,6 +51,8 @@ // We mean it. // +#include <QtCore/private/qglobal_p.h> + QT_BEGIN_NAMESPACE class QGeoRoutingManagerEngine; diff --git a/src/location/maps/qgeoroutingmanagerengine_p.h b/src/location/maps/qgeoroutingmanagerengine_p.h index 2f1cd437..dd643df3 100644 --- a/src/location/maps/qgeoroutingmanagerengine_p.h +++ b/src/location/maps/qgeoroutingmanagerengine_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtLocation module of the Qt Toolkit. @@ -55,6 +55,7 @@ #include <QMap> #include <QLocale> +#include <private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/location/maps/qgeoserviceprovider_p.h b/src/location/maps/qgeoserviceprovider_p.h index 6fd5cba9..5994c33d 100644 --- a/src/location/maps/qgeoserviceprovider_p.h +++ b/src/location/maps/qgeoserviceprovider_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtLocation module of the Qt Toolkit. @@ -56,6 +56,7 @@ #include <QHash> #include <QCborMap> #include <QLocale> +#include <private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/location/maps/qgeotilespec_p_p.h b/src/location/maps/qgeotilespec_p_p.h index 71376c9e..58b53ab7 100644 --- a/src/location/maps/qgeotilespec_p_p.h +++ b/src/location/maps/qgeotilespec_p_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtLocation module of the Qt Toolkit. @@ -52,6 +52,7 @@ #include <QString> #include <QSharedData> +#include <private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/location/places/qplaceattribute_p.h b/src/location/places/qplaceattribute_p.h index d904ef1c..54b203ac 100644 --- a/src/location/places/qplaceattribute_p.h +++ b/src/location/places/qplaceattribute_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtLocation module of the Qt Toolkit. @@ -54,6 +54,7 @@ #include <QSharedData> #include <QString> #include <QVariant> +#include <private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/location/places/qplacecategory_p.h b/src/location/places/qplacecategory_p.h index 798c97af..f5cee9f8 100644 --- a/src/location/places/qplacecategory_p.h +++ b/src/location/places/qplacecategory_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtLocation module of the Qt Toolkit. @@ -56,6 +56,7 @@ #include <QtLocation/QLocation> #include "qplaceicon.h" +#include "private/qglobal_p.h" QT_BEGIN_NAMESPACE diff --git a/src/location/places/qplacecontactdetail_p.h b/src/location/places/qplacecontactdetail_p.h index 90f8da5d..5e9aa786 100644 --- a/src/location/places/qplacecontactdetail_p.h +++ b/src/location/places/qplacecontactdetail_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtLocation module of the Qt Toolkit. @@ -54,6 +54,7 @@ #include <QSharedData> #include <QString> +#include <private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/location/places/qplacecontent_p.h b/src/location/places/qplacecontent_p.h index 3fa3ab63..598392a1 100644 --- a/src/location/places/qplacecontent_p.h +++ b/src/location/places/qplacecontent_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtLocation module of the Qt Toolkit. @@ -58,6 +58,7 @@ #include <QtCore/QSharedData> #include <QtCore/QString> #include <QtCore/QUrl> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/location/places/qplacecontentrequest_p.h b/src/location/places/qplacecontentrequest_p.h index a5a330a4..154e492a 100644 --- a/src/location/places/qplacecontentrequest_p.h +++ b/src/location/places/qplacecontentrequest_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtLocation module of the Qt Toolkit. @@ -54,6 +54,7 @@ #include <QtCore/QSharedData> #include <QtCore/QVariant> #include <QtLocation/QPlaceContent> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/location/places/qplaceicon_p.h b/src/location/places/qplaceicon_p.h index 5b11606f..5292b1bd 100644 --- a/src/location/places/qplaceicon_p.h +++ b/src/location/places/qplaceicon_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtLocation module of the Qt Toolkit. @@ -54,6 +54,7 @@ #include <QMap> #include <QUrl> #include <QSharedData> +#include <private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/location/places/qplacemanagerengine_p.h b/src/location/places/qplacemanagerengine_p.h index 2ea52224..e87548e2 100644 --- a/src/location/places/qplacemanagerengine_p.h +++ b/src/location/places/qplacemanagerengine_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtLocation module of the Qt Toolkit. @@ -53,6 +53,7 @@ #include <QtCore/QString> #include <QtLocation/QLocation> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/location/places/qplaceratings_p.h b/src/location/places/qplaceratings_p.h index ecd0a739..84c527fa 100644 --- a/src/location/places/qplaceratings_p.h +++ b/src/location/places/qplaceratings_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtLocation module of the Qt Toolkit. @@ -52,6 +52,7 @@ // #include <QSharedData> +#include <private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/location/places/qplacereply_p.h b/src/location/places/qplacereply_p.h index 6d8bdd9e..ec3a28f5 100644 --- a/src/location/places/qplacereply_p.h +++ b/src/location/places/qplacereply_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtLocation module of the Qt Toolkit. @@ -52,6 +52,7 @@ // #include "qplacereply.h" +#include "private/qglobal_p.h" QT_BEGIN_NAMESPACE diff --git a/src/location/places/qplacesearchresult_p.h b/src/location/places/qplacesearchresult_p.h index 49095e9b..918ede20 100644 --- a/src/location/places/qplacesearchresult_p.h +++ b/src/location/places/qplacesearchresult_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtLocation module of the Qt Toolkit. @@ -56,6 +56,7 @@ #include <QSharedData> #include <QtLocation/QPlaceIcon> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/location/places/qplacesupplier_p.h b/src/location/places/qplacesupplier_p.h index 425ac1f6..359a8424 100644 --- a/src/location/places/qplacesupplier_p.h +++ b/src/location/places/qplacesupplier_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtLocation module of the Qt Toolkit. @@ -56,6 +56,7 @@ #include <QUrl> #include "qplaceicon.h" +#include "private/qglobal_p.h" QT_BEGIN_NAMESPACE diff --git a/src/location/places/qplaceuser_p.h b/src/location/places/qplaceuser_p.h index af7c95b4..2110ec28 100644 --- a/src/location/places/qplaceuser_p.h +++ b/src/location/places/qplaceuser_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtLocation module of the Qt Toolkit. @@ -53,6 +53,7 @@ #include <QSharedData> #include <QString> +#include <private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/location/qlocationglobal_p.h b/src/location/qlocationglobal_p.h index afc0760b..507b291a 100644 --- a/src/location/qlocationglobal_p.h +++ b/src/location/qlocationglobal_p.h @@ -52,6 +52,7 @@ // #include "qlocationglobal.h" +#include "private/qglobal_p.h" QT_BEGIN_NAMESPACE |