diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2010-02-18 19:52:45 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2010-02-23 19:59:42 (GMT) |
| commit | 35da749cba87e4e08a630bd359403fde8f266f0d (patch) | |
| tree | fc33a1704db9858168fc0d44980d60aa4f5e5ed0 /src/3rdparty | |
| parent | 9f34ce3029326dabad79357acde2c529c5265693 (diff) | |
| download | Qt-35da749cba87e4e08a630bd359403fde8f266f0d.zip Qt-35da749cba87e4e08a630bd359403fde8f266f0d.tar.gz Qt-35da749cba87e4e08a630bd359403fde8f266f0d.tar.bz2 | |
Compile with QT_USE_FAST_OPERATOR_PLUS
Reviewed-by: Joao
(cherry picked from commit 5d3eb7a1062744afad06882e9a8f59c84fd4e8b7)
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/webkit/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp b/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp index 5f343ff..af7e5f6 100644 --- a/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp +++ b/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp @@ -180,7 +180,7 @@ void InspectorClientQt::populateSetting(const String& key, String* setting) return; } - QString settingKey(settingStoragePrefix + key); + QString settingKey(settingStoragePrefix + QString(key)); QString storedValueType = qsettings.value(settingKey + settingStorageTypeSuffix).toString(); QVariant storedValue = qsettings.value(settingKey); storedValue.convert(QVariant::nameToType(storedValueType.toAscii().data())); @@ -197,7 +197,7 @@ void InspectorClientQt::storeSetting(const String& key, const String& setting) } QVariant valueToStore = settingToVariant(setting); - QString settingKey(settingStoragePrefix + key); + QString settingKey(settingStoragePrefix + QString(key)); qsettings.setValue(settingKey, valueToStore); qsettings.setValue(settingKey + settingStorageTypeSuffix, QVariant::typeToName(valueToStore.type())); } |