diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2010-02-18 19:52:45 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2010-02-21 16:15:56 (GMT) |
| commit | 5d3eb7a1062744afad06882e9a8f59c84fd4e8b7 (patch) | |
| tree | e233f5b3cc23645515153185aaa439efa6aad152 /src/3rdparty | |
| parent | 8302f412660410775887c6c524aa87fb67aebde1 (diff) | |
| download | Qt-5d3eb7a1062744afad06882e9a8f59c84fd4e8b7.zip Qt-5d3eb7a1062744afad06882e9a8f59c84fd4e8b7.tar.gz Qt-5d3eb7a1062744afad06882e9a8f59c84fd4e8b7.tar.bz2 | |
Compile with QT_USE_FAST_OPERATOR_PLUS
Reviewed-by: Joao
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 7a1bfd5..5fbc876 100644 --- a/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp +++ b/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp @@ -179,7 +179,7 @@ void InspectorClientQt::populateSetting(const String& key, InspectorController:: 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())); @@ -196,7 +196,7 @@ void InspectorClientQt::storeSetting(const String& key, const InspectorControlle } 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())); } |