diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-06-26 17:24:37 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-06-26 17:24:37 +0200 |
| commit | 5965f0c98b0f9ba1e9ab4434153af1a89d0aac0d (patch) | |
| tree | ef6d6237d5dbe1cfbddd1c8d86cb1ec374787de7 /src/plugins/geoservices | |
| parent | 2f53ba168ec95b299e1544dd2e5b0840b8aa6cb2 (diff) | |
| parent | 7390792c7ac25e515a12427735354727a0d9a9ee (diff) | |
| download | qtlocation-5965f0c98b0f9ba1e9ab4434153af1a89d0aac0d.tar.gz | |
Merge remote-tracking branch 'origin/5.3' into dev
Conflicts:
.qmake.conf
Change-Id: Ifc66b48e407d27f0dd8bb2a38f509bb507f89337
Diffstat (limited to 'src/plugins/geoservices')
| -rw-r--r-- | src/plugins/geoservices/nokia/nokia.pro | 2 | ||||
| -rw-r--r-- | src/plugins/geoservices/osm/osm.pro | 2 |
2 files changed, 2 insertions, 2 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 += \ |