diff options
Diffstat (limited to 'src/corelib/io/qsettings.cpp')
| -rw-r--r-- | src/corelib/io/qsettings.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp index 63a0266948..1748170324 100644 --- a/src/corelib/io/qsettings.cpp +++ b/src/corelib/io/qsettings.cpp @@ -696,6 +696,9 @@ void QSettingsPrivate::iniEscapedString(const QString &str, QByteArray &result, { bool needsQuotes = false; bool escapeNextIfDigit = false; + bool useCodec = codec && !str.startsWith(QLatin1String("@ByteArray(")) + && !str.startsWith(QLatin1String("@Variant(")); + int i; int startPos = result.size(); @@ -748,12 +751,12 @@ void QSettingsPrivate::iniEscapedString(const QString &str, QByteArray &result, result += (char)ch; break; default: - if (ch <= 0x1F || (ch >= 0x7F && !codec)) { + if (ch <= 0x1F || (ch >= 0x7F && !useCodec)) { result += "\\x"; result += QByteArray::number(ch, 16); escapeNextIfDigit = true; #ifndef QT_NO_TEXTCODEC - } else if (codec) { + } else if (useCodec) { // slow result += codec->fromUnicode(str.at(i)); #endif @@ -1084,10 +1087,10 @@ static QString windowsConfigPath(int type) ComPtr<IStorageItem> localFolderItem; if (FAILED(localFolder.As(&localFolderItem))) return result; - HSTRING path; - if (FAILED(localFolderItem->get_Path(&path))) + HString path; + if (FAILED(localFolderItem->get_Path(path.GetAddressOf()))) return result; - result = QString::fromWCharArray(WindowsGetStringRawBuffer(path, nullptr)); + result = QString::fromWCharArray(path.GetRawBuffer(nullptr)); } switch (type) { |