diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2011-11-29 10:39:50 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-29 04:25:50 +0100 |
| commit | 57aa58e27f4fd71a5467bbb4bed1f648e91c75a3 (patch) | |
| tree | b9651910df6fa69ebb1dd79ed40d30ca9587db57 /src/plugins | |
| parent | ce08d24645deb8f9eb1ebd49f2cc585340d4370f (diff) | |
| download | qtlocation-57aa58e27f4fd71a5467bbb4bed1f648e91c75a3.tar.gz | |
Add project file option to enable China support.
To enable China support "QT_CONFIG+=location-china-support" must be
passed to qmake. When building all of Qt this will require rerunning
qmake in the qtlocation directory. China support defaults to off.
Fixes unconditional linking of the "nokia" plugin to the QtSystemInfo
library.
Change-Id: Ic51ac709b3bcee1e0c3df6265acde62542d93a35
Reviewed-by: Alex <alex.blasche@nokia.com>
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) |