diff options
Diffstat (limited to 'src/plugins')
3 files changed, 11 insertions, 1 deletions
diff --git a/src/plugins/geoservices/nokia/nokia.pro b/src/plugins/geoservices/nokia/nokia.pro index c8c0f064..e043d839 100644 --- a/src/plugins/geoservices/nokia/nokia.pro +++ b/src/plugins/geoservices/nokia/nokia.pro @@ -1,7 +1,13 @@ load(qt_module) TARGET = qtgeoservices_nokia -QT += location network systeminfo +QT += location network + +contains(QT_CONFIG, location-china-support) { + # China support + QT += systeminfo + DEFINES += USE_CHINA_NETWORK_REGISTRATION +} load(qt_plugin) diff --git a/src/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.cpp index 815b5727..df94c263 100644 --- a/src/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.cpp @@ -360,6 +360,7 @@ void QGeoMappingManagerEngineNokia::setHost(const QString &host) } } +#ifdef USE_CHINA_NETWORK_REGISTRATION void QGeoMappingManagerEngineNokia::currentMobileCountryCodeChanged(int interface, const QString & mcc) { Q_UNUSED(interface) @@ -367,6 +368,7 @@ void QGeoMappingManagerEngineNokia::currentMobileCountryCodeChanged(int interfac setHost(MAPTILES_HOST_CN); } } +#endif bool QGeoMappingManagerEngineNokia::isValidParameter(const QString ¶m) { diff --git a/src/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.h b/src/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.h index b545c116..9c11ed0e 100644 --- a/src/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.h +++ b/src/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.h @@ -86,8 +86,10 @@ public: const QString& applicationId() const; const QString& referer() const; +#ifdef USE_CHINA_NETWORK_REGISTRATION private Q_SLOTS: void currentMobileCountryCodeChanged(int interface, const QString& mcc); +#endif private: Q_DISABLE_COPY(QGeoMappingManagerEngineNokia) |