23 lines
1.2 KiB
Diff
23 lines
1.2 KiB
Diff
|
diff --git a/src/corelib/text/qstringconverter.cpp b/src/corelib/text/qstringconverter.cpp
|
||
|
|
index 6ca65ba6ad8..043b8f54151 100644
|
||
|
|
--- a/src/corelib/text/qstringconverter.cpp
|
||
|
|
+++ b/src/corelib/text/qstringconverter.cpp
|
||
|
|
@@ -1966,7 +1966,7 @@ struct QStringConverterICU : QStringConverter
|
||
|
|
const void *context;
|
||
|
|
ucnv_getToUCallBack(icu_conv, &action, &context);
|
||
|
|
if (context != state)
|
||
|
|
- ucnv_setToUCallBack(icu_conv, action, &state, nullptr, nullptr, &err);
|
||
|
|
+ ucnv_setToUCallBack(icu_conv, action, state, nullptr, nullptr, &err);
|
||
|
|
|
||
|
|
ucnv_toUnicode(icu_conv, &target, targetLimit, &source, sourceLimit, nullptr, flush, &err);
|
||
|
|
// We did reserve enough space:
|
||
|
|
@@ -1999,7 +1999,7 @@ struct QStringConverterICU : QStringConverter
|
||
|
|
const void *context;
|
||
|
|
ucnv_getFromUCallBack(icu_conv, &action, &context);
|
||
|
|
if (context != state)
|
||
|
|
- ucnv_setFromUCallBack(icu_conv, action, &state, nullptr, nullptr, &err);
|
||
|
|
+ ucnv_setFromUCallBack(icu_conv, action, state, nullptr, nullptr, &err);
|
||
|
|
|
||
|
|
ucnv_fromUnicode(icu_conv, &target, targetLimit, &source, sourceLimit, nullptr, flush, &err);
|
||
|
|
// We did reserve enough space:
|