diff options
author | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-02-24 17:27:30 +0100 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-02-28 12:15:32 +0000 |
commit | ed87048b390fdd48c8122f88c3349b5c772843f9 (patch) | |
tree | 96bd6393bc53b0dc8f47b60466ba9eefd3005498 | |
parent | 2691b2852dcc49a3bc60a82f5345ced892a2d8b6 (diff) | |
download | qtlocation-ed87048b390fdd48c8122f88c3349b5c772843f9.tar.gz |
Resolve duplicate meta type definition causing issue for unity build
Task-number: QTBUG-109394
Change-Id: Ic909c4e0e76e8744176421125d9fcda6b602bf0c
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 7334a4b08d553d00aba6d1f5301e833c30029510)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r-- | src/location/maps/qabstractgeotilecache.cpp | 3 | ||||
-rw-r--r-- | src/location/maps/qgeofiletilecache.cpp | 3 | ||||
-rw-r--r-- | src/location/maps/qgeotilespec_p.h | 4 |
3 files changed, 4 insertions, 6 deletions
diff --git a/src/location/maps/qabstractgeotilecache.cpp b/src/location/maps/qabstractgeotilecache.cpp index ca8022b5..e99af906 100644 --- a/src/location/maps/qabstractgeotilecache.cpp +++ b/src/location/maps/qabstractgeotilecache.cpp @@ -12,9 +12,6 @@ #include <QPixmap> #include <QDebug> -Q_DECLARE_METATYPE(QList<QGeoTileSpec>) -Q_DECLARE_METATYPE(QSet<QGeoTileSpec>) - QT_BEGIN_NAMESPACE QAbstractGeoTileCache::QAbstractGeoTileCache(QObject *parent) diff --git a/src/location/maps/qgeofiletilecache.cpp b/src/location/maps/qgeofiletilecache.cpp index 23cf3d45..65ae9d41 100644 --- a/src/location/maps/qgeofiletilecache.cpp +++ b/src/location/maps/qgeofiletilecache.cpp @@ -12,9 +12,6 @@ #include <QPixmap> #include <QDebug> -Q_DECLARE_METATYPE(QList<QGeoTileSpec>) -Q_DECLARE_METATYPE(QSet<QGeoTileSpec>) - QT_BEGIN_NAMESPACE class QGeoCachedTileMemory diff --git a/src/location/maps/qgeotilespec_p.h b/src/location/maps/qgeotilespec_p.h index 408bcfa3..3d0ac578 100644 --- a/src/location/maps/qgeotilespec_p.h +++ b/src/location/maps/qgeotilespec_p.h @@ -17,6 +17,8 @@ #include <QtLocation/private/qlocationglobal_p.h> #include <QtCore/QMetaType> +#include <QtCore/QList> +#include <QtCore/QSet> #include <QString> #include <QSharedDataPointer> @@ -78,5 +80,7 @@ Q_LOCATION_PRIVATE_EXPORT QDebug operator<<(QDebug, const QGeoTileSpec &); QT_END_NAMESPACE Q_DECLARE_METATYPE(QGeoTileSpec) +Q_DECLARE_METATYPE(QList<QGeoTileSpec>) +Q_DECLARE_METATYPE(QSet<QGeoTileSpec>) #endif // QGEOTILESPEC_H |