From 7390792c7ac25e515a12427735354727a0d9a9ee Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Wed, 25 Jun 2014 10:14:11 +0200 Subject: 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 --- src/plugins/geoservices/nokia/nokia.pro | 2 +- src/plugins/geoservices/osm/osm.pro | 2 +- src/plugins/position/android/src/src.pro | 2 +- src/plugins/position/blackberry/blackberry.pro | 2 +- src/plugins/position/corelocation/corelocation.pro | 2 +- src/plugins/position/geoclue/geoclue.pro | 2 +- src/plugins/position/gypsy/gypsy.pro | 2 +- src/plugins/position/positionpoll/positionpoll.pro | 2 +- src/plugins/position/positionpoll/positionpollfactory.cpp | 6 +++--- src/plugins/position/positionpoll/positionpollfactory.h | 2 +- src/plugins/position/simulator/simulator.pro | 2 +- src/plugins/position/winrt/winrt.pro | 1 + 12 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/plugins/geoservices/nokia/nokia.pro b/src/plugins/geoservices/nokia/nokia.pro index f9c6a5cc..a0f8d1b6 100644 --- a/src/plugins/geoservices/nokia/nokia.pro +++ b/src/plugins/geoservices/nokia/nokia.pro @@ -8,7 +8,7 @@ contains(QT_CONFIG, location-china-support) { } PLUGIN_TYPE = geoservices -PLUGIN_CLASS_NAME = NokiaGeoServicePlugin +PLUGIN_CLASS_NAME = QGeoServiceProviderFactoryNokia load(qt_plugin) HEADERS += \ diff --git a/src/plugins/geoservices/osm/osm.pro b/src/plugins/geoservices/osm/osm.pro index cb82aeaa..f8744061 100644 --- a/src/plugins/geoservices/osm/osm.pro +++ b/src/plugins/geoservices/osm/osm.pro @@ -2,7 +2,7 @@ TARGET = qtgeoservices_osm QT += location-private positioning-private network PLUGIN_TYPE = geoservices -PLUGIN_CLASS_NAME = OSMGeoServicePlugin +PLUGIN_CLASS_NAME = QGeoServiceProviderFactoryOsm load(qt_plugin) HEADERS += \ diff --git a/src/plugins/position/android/src/src.pro b/src/plugins/position/android/src/src.pro index 4f1e4412..9c81dde5 100644 --- a/src/plugins/position/android/src/src.pro +++ b/src/plugins/position/android/src/src.pro @@ -2,7 +2,7 @@ TARGET = qtposition_android QT = core positioning PLUGIN_TYPE = position -PLUGIN_CLASS_NAME = AndroidPositionPlugin +PLUGIN_CLASS_NAME = QGeoPositionInfoSourceFactoryAndroid load(qt_plugin) diff --git a/src/plugins/position/blackberry/blackberry.pro b/src/plugins/position/blackberry/blackberry.pro index 852f6dc7..f64c8026 100644 --- a/src/plugins/position/blackberry/blackberry.pro +++ b/src/plugins/position/blackberry/blackberry.pro @@ -2,7 +2,7 @@ TARGET = qtposition_blackberry QT = core positioning PLUGIN_TYPE = position -PLUGIN_CLASS_NAME = BBPositionPlugin +PLUGIN_CLASS_NAME = QGeoPositionInfoSourceFactoryBb load(qt_plugin) INCLUDEPATH += $$QT.location.includes diff --git a/src/plugins/position/corelocation/corelocation.pro b/src/plugins/position/corelocation/corelocation.pro index 544d825a..1a1a2a39 100644 --- a/src/plugins/position/corelocation/corelocation.pro +++ b/src/plugins/position/corelocation/corelocation.pro @@ -2,7 +2,7 @@ TARGET = qtposition_cl QT = core positioning PLUGIN_TYPE = position -PLUGIN_CLASS_NAME = IOSPositionPlugin +PLUGIN_CLASS_NAME = QGeoPositionInfoSourceFactoryCL load(qt_plugin) INCLUDEPATH += $$QT.location.includes diff --git a/src/plugins/position/geoclue/geoclue.pro b/src/plugins/position/geoclue/geoclue.pro index 9db7839f..0aba06e3 100644 --- a/src/plugins/position/geoclue/geoclue.pro +++ b/src/plugins/position/geoclue/geoclue.pro @@ -2,7 +2,7 @@ TARGET = qtposition_geoclue QT = core positioning PLUGIN_TYPE = position -PLUGIN_CLASS_NAME = GeoCluePositionPlugin +PLUGIN_CLASS_NAME = QGeoPositionInfoSourceFactoryGeoclue load(qt_plugin) HEADERS += \ diff --git a/src/plugins/position/gypsy/gypsy.pro b/src/plugins/position/gypsy/gypsy.pro index 3bd9b144..8e9f7dfa 100644 --- a/src/plugins/position/gypsy/gypsy.pro +++ b/src/plugins/position/gypsy/gypsy.pro @@ -2,7 +2,7 @@ TARGET = qtposition_gypsy QT = core positioning PLUGIN_TYPE = position -PLUGIN_CLASS_NAME = GypsyPositionPlugin +PLUGIN_CLASS_NAME = QGeoPositionInfoSourceFactoryGypsy load(qt_plugin) HEADERS += \ 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 #include -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" diff --git a/src/plugins/position/simulator/simulator.pro b/src/plugins/position/simulator/simulator.pro index 18d12dfb..23953782 100644 --- a/src/plugins/position/simulator/simulator.pro +++ b/src/plugins/position/simulator/simulator.pro @@ -2,7 +2,7 @@ TARGET = qtposition_simulator QT = core network positioning PLUGIN_TYPE = position -PLUGIN_CLASS_NAME = SimulatorPositionPlugin +PLUGIN_CLASS_NAME = QGeoPositionInfoSourceFactorySimulator load(qt_plugin) INCLUDEPATH += $$QT.location.includes diff --git a/src/plugins/position/winrt/winrt.pro b/src/plugins/position/winrt/winrt.pro index 2632d4f8..eb4f4b74 100644 --- a/src/plugins/position/winrt/winrt.pro +++ b/src/plugins/position/winrt/winrt.pro @@ -2,6 +2,7 @@ TARGET = qtposition_winrt QT = core positioning PLUGIN_TYPE = position +PLUGIN_CLASS_NAME = QGeoPositionInfoSourceFactoryWinrt load(qt_plugin) INCLUDEPATH += $$QT.location.includes -- cgit v1.2.3