diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-02-12 16:12:56 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-02-25 16:51:36 +0000 |
| commit | d5c4de432d4ddd73ee4ed8e79dbaf70f99565123 (patch) | |
| tree | 6f5ddebbcaba5087677e0b059c9e6e11ae02bbee /src/plugins/geoservices | |
| parent | 5cb6d1bac19bf779afbbd22bbe723e43aa86c1b7 (diff) | |
| download | qtlocation-d5c4de432d4ddd73ee4ed8e79dbaf70f99565123.tar.gz | |
consistently put {qt,qml}_{module,plugin} at the end of project files
this fixes static builds by ensuring that all dependencies are exported.
Task-number: QTBUG-51071
Change-Id: Ia0fcc7b40cbd80bde8edddcf8253b3136ed851ff
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'src/plugins/geoservices')
| -rw-r--r-- | src/plugins/geoservices/mapbox/mapbox.pro | 8 | ||||
| -rw-r--r-- | src/plugins/geoservices/nokia/nokia.pro | 8 | ||||
| -rw-r--r-- | src/plugins/geoservices/osm/osm.pro | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/src/plugins/geoservices/mapbox/mapbox.pro b/src/plugins/geoservices/mapbox/mapbox.pro index 7fdfa508..d4797e37 100644 --- a/src/plugins/geoservices/mapbox/mapbox.pro +++ b/src/plugins/geoservices/mapbox/mapbox.pro @@ -1,9 +1,6 @@ TARGET = qtgeoservices_mapbox -QT += location-private positioning-private network -PLUGIN_TYPE = geoservices -PLUGIN_CLASS_NAME = QGeoServiceProviderFactoryMapbox -load(qt_plugin) +QT += location-private positioning-private network HEADERS += \ qgeoserviceproviderpluginmapbox.h \ @@ -20,3 +17,6 @@ SOURCES += \ OTHER_FILES += \ mapbox_plugin.json +PLUGIN_TYPE = geoservices +PLUGIN_CLASS_NAME = QGeoServiceProviderFactoryMapbox +load(qt_plugin) diff --git a/src/plugins/geoservices/nokia/nokia.pro b/src/plugins/geoservices/nokia/nokia.pro index 62b04870..cd340f50 100644 --- a/src/plugins/geoservices/nokia/nokia.pro +++ b/src/plugins/geoservices/nokia/nokia.pro @@ -1,4 +1,5 @@ TARGET = qtgeoservices_nokia + QT += location-private positioning-private network contains(QT_CONFIG, location-china-support) { @@ -7,10 +8,6 @@ contains(QT_CONFIG, location-china-support) { QT += systeminfo } -PLUGIN_TYPE = geoservices -PLUGIN_CLASS_NAME = QGeoServiceProviderFactoryNokia -load(qt_plugin) - HEADERS += \ qgeocodereply_nokia.h \ qgeocodexmlparser.h \ @@ -59,3 +56,6 @@ INCLUDEPATH += ../../../location/maps OTHER_FILES += \ nokia_plugin.json +PLUGIN_TYPE = geoservices +PLUGIN_CLASS_NAME = QGeoServiceProviderFactoryNokia +load(qt_plugin) diff --git a/src/plugins/geoservices/osm/osm.pro b/src/plugins/geoservices/osm/osm.pro index a00f1fb8..e73c16d7 100644 --- a/src/plugins/geoservices/osm/osm.pro +++ b/src/plugins/geoservices/osm/osm.pro @@ -1,9 +1,6 @@ TARGET = qtgeoservices_osm -QT += location-private positioning-private network -PLUGIN_TYPE = geoservices -PLUGIN_CLASS_NAME = QGeoServiceProviderFactoryOsm -load(qt_plugin) +QT += location-private positioning-private network HEADERS += \ qgeoserviceproviderpluginosm.h \ @@ -37,3 +34,6 @@ SOURCES += \ OTHER_FILES += \ osm_plugin.json +PLUGIN_TYPE = geoservices +PLUGIN_CLASS_NAME = QGeoServiceProviderFactoryOsm +load(qt_plugin) |