summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/corelib/io/qsettings.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp
index c9122e5962d..2eeed3f57ce 100644
--- a/src/corelib/io/qsettings.cpp
+++ b/src/corelib/io/qsettings.cpp
@@ -748,7 +748,7 @@ bool QSettingsPrivate::iniUnescapedStringList(const QByteArray &str, int from, i
bool isStringList = false;
bool inQuotedString = false;
bool currentValueIsQuoted = false;
- int escapeVal = 0;
+ char16_t escapeVal = 0;
int i = from;
char ch;
@@ -854,7 +854,7 @@ StNormal:
StHexEscape:
if (i >= to) {
- stringResult += QChar(escapeVal);
+ stringResult += escapeVal;
goto end;
}
@@ -867,13 +867,13 @@ StHexEscape:
++i;
goto StHexEscape;
} else {
- stringResult += QChar(escapeVal);
+ stringResult += escapeVal;
goto StNormal;
}
StOctEscape:
if (i >= to) {
- stringResult += QChar(escapeVal);
+ stringResult += escapeVal;
goto end;
}
@@ -884,7 +884,7 @@ StOctEscape:
++i;
goto StOctEscape;
} else {
- stringResult += QChar(escapeVal);
+ stringResult += escapeVal;
goto StNormal;
}