Merge remote-tracking branch 'origin/5.12' into dev

 Conflicts:
	src/corelib/serialization/qcborcommon.h
	src/corelib/tools/qlocale_data_p.h
	tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp

Done-with: Edward Welbourne <edward.welbourne@qt.io>
Change-Id: Ibed987f6d77a0294f78f67d78625237616082416

1 files changed, 5 insertions, 5 deletions

diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp
index 03fc10ed07..560453de84 100644
--- a/src/corelib/tools/qstring.cpp
+++ b/src/corelib/tools/qstring.cpp
@@ -44,7 +44,7 @@
 #include "qregularexpression.h"
 #endif
 #include "qunicodetables_p.h"
-#ifndef QT_NO_TEXTCODEC
+#if QT_CONFIG(textcodec)
 #include <qtextcodec.h>
 #endif
 #include <private/qutfcodec_p.h>
@@ -5277,11 +5277,11 @@ static QByteArray qt_convert_to_local_8bit(QStringView string)
 {
     if (string.isNull())
         return QByteArray();
-#ifndef QT_NO_TEXTCODEC
+#if QT_CONFIG(textcodec)
     QTextCodec *localeCodec = QTextCodec::codecForLocale();
     if (localeCodec)
         return localeCodec->fromUnicode(string);
-#endif // QT_NO_TEXTCODEC
+#endif // textcodec
     return qt_convert_to_latin1(string);
 }
 
@@ -5475,13 +5475,13 @@ QString QString::fromLocal8Bit_helper(const char *str, int size)
         QStringDataPtr empty = { Data::allocate(0) };
         return QString(empty);
     }
-#if !defined(QT_NO_TEXTCODEC)
+#if QT_CONFIG(textcodec)
     if (size < 0)
         size = qstrlen(str);
     QTextCodec *codec = QTextCodec::codecForLocale();
     if (codec)
         return codec->toUnicode(str, size);
-#endif // !QT_NO_TEXTCODEC
+#endif // textcodec
     return fromLatin1(str, size);
 }