diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-23 00:34:05 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-23 00:34:05 +1000 |
| commit | e8bd7d147153f72eb1111eee477440d29dda826d (patch) | |
| tree | 3712177c2038889e7890969d97403da7f405ab10 /plugins/geoservices | |
| parent | 3667ba31fb8affb5c15f37647bdd62c7c368a064 (diff) | |
| parent | feadcb1feac7565a57837cd85de384b12b46a87f (diff) | |
Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-multimedia into master-integration
* 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-multimedia:
Revert "Fixed a typo in qsysteminfo_s60.cpp"
Silenced compiler warnings
Replaced CAP_GENERAL_DLL with 'ALL -TCB'
Fixed a typo in qsysteminfo_s60.cpp
Diffstat (limited to 'plugins/geoservices')
| -rw-r--r-- | plugins/geoservices/nokia/jsonparser.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/geoservices/nokia/jsonparser.h b/plugins/geoservices/nokia/jsonparser.h index 5ea0a69072..365e153864 100644 --- a/plugins/geoservices/nokia/jsonparser.h +++ b/plugins/geoservices/nokia/jsonparser.h @@ -76,7 +76,7 @@ public: if (pos < data.size()) return data[pos].toLatin1(); else - return -1; + return static_cast<char>(-1); } QChar peekQ() const { |