diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2014-06-25 10:14:11 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@digia.com> | 2014-06-25 10:59:38 +0200 |
| commit | 7390792c7ac25e515a12427735354727a0d9a9ee (patch) | |
| tree | 19f4fd40960d9e239539b7ed8ea5b9c44257cdfb /src/plugins/position/positionpoll | |
| parent | 12ed54ebfc934e3ca7fb1794c724fb30dc4533c4 (diff) | |
Fix the names of the plugin factory classes for static plugin loading
This breaks positioning on IOS and any other statically build Qt
versions.
At the same time rename the positionpoll factory class to a more
appropriate name to avoid confusion.
[ChangeLog][QtPositioning] [iOS] Fixed link error of positioncl
and positionpoll plug-in.
Task-number: QTBUG-39843
Change-Id: Ic3d5687571cd9e7a531f9958675b895cf22ac13e
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Diffstat (limited to 'src/plugins/position/positionpoll')
| -rw-r--r-- | src/plugins/position/positionpoll/positionpoll.pro | 2 | ||||
| -rw-r--r-- | src/plugins/position/positionpoll/positionpollfactory.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/position/positionpoll/positionpollfactory.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/position/positionpoll/positionpoll.pro b/src/plugins/position/positionpoll/positionpoll.pro index 4af58327..dc7ebed1 100644 --- a/src/plugins/position/positionpoll/positionpoll.pro +++ b/src/plugins/position/positionpoll/positionpoll.pro @@ -2,7 +2,7 @@ TARGET = qtposition_positionpoll QT = core positioning PLUGIN_TYPE = position -PLUGIN_CLASS_NAME = PollPositionPlugin +PLUGIN_CLASS_NAME = QGeoPositionInfoSourceFactoryPoll load(qt_plugin) SOURCES += \ diff --git a/src/plugins/position/positionpoll/positionpollfactory.cpp b/src/plugins/position/positionpoll/positionpollfactory.cpp index 2acafbc7..f6d8a879 100644 --- a/src/plugins/position/positionpoll/positionpollfactory.cpp +++ b/src/plugins/position/positionpoll/positionpollfactory.cpp @@ -42,19 +42,19 @@ #include "positionpollfactory.h" #include "qgeoareamonitor_polling.h" -QGeoPositionInfoSource *QGeoPositionInfoSourceFactoryAndroid::positionInfoSource(QObject *parent) +QGeoPositionInfoSource *QGeoPositionInfoSourceFactoryPoll::positionInfoSource(QObject *parent) { Q_UNUSED(parent); return 0; } -QGeoSatelliteInfoSource *QGeoPositionInfoSourceFactoryAndroid::satelliteInfoSource(QObject *parent) +QGeoSatelliteInfoSource *QGeoPositionInfoSourceFactoryPoll::satelliteInfoSource(QObject *parent) { Q_UNUSED(parent); return 0; } -QGeoAreaMonitorSource *QGeoPositionInfoSourceFactoryAndroid::areaMonitor(QObject *parent) +QGeoAreaMonitorSource *QGeoPositionInfoSourceFactoryPoll::areaMonitor(QObject *parent) { QGeoAreaMonitorPolling *ret = new QGeoAreaMonitorPolling(parent); if (ret && ret->isValid()) diff --git a/src/plugins/position/positionpoll/positionpollfactory.h b/src/plugins/position/positionpoll/positionpollfactory.h index 4b7818d4..9f08fe40 100644 --- a/src/plugins/position/positionpoll/positionpollfactory.h +++ b/src/plugins/position/positionpoll/positionpollfactory.h @@ -45,7 +45,7 @@ #include <QObject> #include <QGeoPositionInfoSourceFactory> -class QGeoPositionInfoSourceFactoryAndroid : public QObject, public QGeoPositionInfoSourceFactory +class QGeoPositionInfoSourceFactoryPoll : public QObject, public QGeoPositionInfoSourceFactory { Q_OBJECT Q_PLUGIN_METADATA(IID "org.qt-project.qt.position.sourcefactory/5.0" |