diff options
| author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2017-05-11 15:41:37 +0300 |
|---|---|---|
| committer | Paolo Angelelli <paolo.angelelli@qt.io> | 2017-05-20 09:29:20 +0000 |
| commit | 5767601d95e33b20962d0cd88cc6ce5c8c724a91 (patch) | |
| tree | 5e82ea58d1117204a4a07cd169394c38fc0af6cc /src/plugins/geoservices/esri | |
| parent | 5bae353bc2faf0aab222d09b1bf21fc0e0dc37eb (diff) | |
| download | qtlocation-5767601d95e33b20962d0cd88cc6ce5c8c724a91.tar.gz | |
Fix resources not loading on static builds
Explicitly call Q_INIT_RESOURCE, otherwise the resources are not
found and the plugins using resources are broken when building
Qt with -static.
This patch also adds a prefix to these resources to avoid collision,
since they are very generic like "logo.png" or "maps.json".
Task-number: QTBUG-60007
Change-Id: Ifb73e9b97af107f2e24f5478f3de534bbd40e158
Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
Diffstat (limited to 'src/plugins/geoservices/esri')
| -rw-r--r-- | src/plugins/geoservices/esri/esri.qrc | 2 | ||||
| -rw-r--r-- | src/plugins/geoservices/esri/geotiledmappingmanagerengine_esri.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/geoservices/esri/esri.qrc b/src/plugins/geoservices/esri/esri.qrc index 43b0857f..d085b09f 100644 --- a/src/plugins/geoservices/esri/esri.qrc +++ b/src/plugins/geoservices/esri/esri.qrc @@ -1,5 +1,5 @@ <RCC> - <qresource prefix="/"> + <qresource prefix="/esri"> <file>maps.json</file> </qresource> </RCC> diff --git a/src/plugins/geoservices/esri/geotiledmappingmanagerengine_esri.cpp b/src/plugins/geoservices/esri/geotiledmappingmanagerengine_esri.cpp index 00d17327..23783d7e 100644 --- a/src/plugins/geoservices/esri/geotiledmappingmanagerengine_esri.cpp +++ b/src/plugins/geoservices/esri/geotiledmappingmanagerengine_esri.cpp @@ -240,7 +240,7 @@ bool GeoTiledMappingManagerEngineEsri::initializeMapSources(QGeoServiceProvider: QString *errorString) { initResources(); - QFile mapsFile(":/maps.json"); + QFile mapsFile(":/esri/maps.json"); if (!mapsFile.open(QIODevice::ReadOnly)) { *error = QGeoServiceProvider::NotSupportedError; |