diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-17 17:18:37 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-17 17:18:37 +0100 |
| commit | cfdb4955c84a6ae8bbd88a02ad4230bba94b83f7 (patch) | |
| tree | f3bc4edaa7bdfc1be38b8ea73e9c438c6eec7266 /src/plugins/position/geoclue | |
| parent | e584af651f5b7b2855a37cee7d94999ce3374b5c (diff) | |
| parent | ca0ff22144a54215bc25dfe6f4d3a7fa18c6e928 (diff) | |
| download | qtlocation-cfdb4955c84a6ae8bbd88a02ad4230bba94b83f7.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
src/plugins/position/geoclue/qgeopositioninfosourcefactory_geoclue.cpp
Change-Id: Iae3f3c00d46c903e2fa6c1dd49876839362f8001
Diffstat (limited to 'src/plugins/position/geoclue')
| -rw-r--r-- | src/plugins/position/geoclue/qgeopositioninfosourcefactory_geoclue.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/position/geoclue/qgeopositioninfosourcefactory_geoclue.cpp b/src/plugins/position/geoclue/qgeopositioninfosourcefactory_geoclue.cpp index f02c7eb1..6be7888b 100644 --- a/src/plugins/position/geoclue/qgeopositioninfosourcefactory_geoclue.cpp +++ b/src/plugins/position/geoclue/qgeopositioninfosourcefactory_geoclue.cpp @@ -47,8 +47,11 @@ #include "qgeosatelliteinfosource_geocluemaster.h" #endif +Q_DECLARE_METATYPE(QGeoPositionInfo) + QGeoPositionInfoSource *QGeoPositionInfoSourceFactoryGeoclue::positionInfoSource(QObject *parent) { + qRegisterMetaType<QGeoPositionInfo>(); return new QGeoPositionInfoSourceGeoclueMaster(parent); } |