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

 Conflicts:
	src/plugins/platformthemes/platformthemes.pro
	src/printsupport/kernel/qplatformprintdevice.cpp

Change-Id: Iac01729ad954bb1c7af5867d982eb243b2139ee6

21 files changed, 54 insertions, 91 deletions

diff --git a/src/corelib/codecs/codecs.pri b/src/corelib/codecs/codecs.pri
index dc8974d13f..d86d446c72 100644
--- a/src/corelib/codecs/codecs.pri
+++ b/src/corelib/codecs/codecs.pri
@@ -1,44 +1,52 @@
 # Qt core library codecs module
 
 HEADERS += \
-    codecs/qisciicodec_p.h \
     codecs/qlatincodec_p.h \
     codecs/qsimplecodec_p.h \
     codecs/qtextcodec_p.h \
     codecs/qtextcodec.h \
-    codecs/qtsciicodec_p.h \
     codecs/qutfcodec_p.h
 
 SOURCES += \
-    codecs/qisciicodec.cpp \
     codecs/qlatincodec.cpp \
     codecs/qsimplecodec.cpp \
     codecs/qtextcodec.cpp \
-    codecs/qtsciicodec.cpp \
     codecs/qutfcodec.cpp
 
+qtConfig(codecs) {
+    HEADERS += \
+        codecs/qisciicodec_p.h \
+        codecs/qtsciicodec_p.h
+
+    SOURCES += \
+        codecs/qisciicodec.cpp \
+        codecs/qtsciicodec.cpp
+}
+
 qtConfig(icu) {
     HEADERS += \
         codecs/qicucodec_p.h
     SOURCES += \
         codecs/qicucodec.cpp
 } else {
-    HEADERS += \
-        codecs/qgb18030codec_p.h \
-        codecs/qeucjpcodec_p.h \
-        codecs/qjiscodec_p.h \
-        codecs/qsjiscodec_p.h \
-        codecs/qeuckrcodec_p.h \
-        codecs/qbig5codec_p.h
+    qtConfig(big_codecs) {
+        HEADERS += \
+            codecs/qgb18030codec_p.h \
+            codecs/qeucjpcodec_p.h \
+            codecs/qjiscodec_p.h \
+            codecs/qsjiscodec_p.h \
+            codecs/qeuckrcodec_p.h \
+            codecs/qbig5codec_p.h
 
-    SOURCES += \
-        codecs/qgb18030codec.cpp \
-        codecs/qjpunicode.cpp \
-        codecs/qeucjpcodec.cpp \
-        codecs/qjiscodec.cpp \
-        codecs/qsjiscodec.cpp \
-        codecs/qeuckrcodec.cpp \
-        codecs/qbig5codec.cpp
+        SOURCES += \
+            codecs/qgb18030codec.cpp \
+            codecs/qjpunicode.cpp \
+            codecs/qeucjpcodec.cpp \
+            codecs/qjiscodec.cpp \
+            codecs/qsjiscodec.cpp \
+            codecs/qeuckrcodec.cpp \
+            codecs/qbig5codec.cpp
+    }
 
     qtConfig(iconv) {
         HEADERS += codecs/qiconvcodec_p.h
diff --git a/src/corelib/codecs/qbig5codec.cpp b/src/corelib/codecs/qbig5codec.cpp
index bfd07408b8..381bf3f790 100644
--- a/src/corelib/codecs/qbig5codec.cpp
+++ b/src/corelib/codecs/qbig5codec.cpp
@@ -41,7 +41,6 @@
 
 QT_BEGIN_NAMESPACE
 
-#ifndef QT_NO_BIG_CODECS
 static int qt_Big5hkscsToUnicode(const uchar *s, uint *pwc);
 static int qt_UnicodeToBig5hkscs(uint wc, uchar *r);
 
@@ -12661,6 +12660,5 @@ int qt_UnicodeToBig5hkscs (uint wc, uchar *r)
 
 
 /* ====================================================================== */
-#endif // QT_NO_BIG_CODECS
 
 QT_END_NAMESPACE
diff --git a/src/corelib/codecs/qbig5codec_p.h b/src/corelib/codecs/qbig5codec_p.h
index 9dbcf41a6d..2db8377ee3 100644
--- a/src/corelib/codecs/qbig5codec_p.h
+++ b/src/corelib/codecs/qbig5codec_p.h
@@ -59,9 +59,9 @@
 #include <QtCore/qtextcodec.h>
 #include <QtCore/qlist.h>
 
-QT_BEGIN_NAMESPACE
+QT_REQUIRE_CONFIG(big_codecs);
 
-#ifndef QT_NO_BIG_CODECS
+QT_BEGIN_NAMESPACE
 
 class QBig5Codec : public QTextCodec {
 public:
@@ -91,8 +91,6 @@ public:
     QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const;
 };
 
-#endif // QT_NO_BIG_CODECS
-
 QT_END_NAMESPACE
 
 #endif // QBIG5CODEC_P_H
diff --git a/src/corelib/codecs/qeucjpcodec.cpp b/src/corelib/codecs/qeucjpcodec.cpp
index c3131fe601..3192f355d8 100644
--- a/src/corelib/codecs/qeucjpcodec.cpp
+++ b/src/corelib/codecs/qeucjpcodec.cpp
@@ -76,8 +76,6 @@
 
 QT_BEGIN_NAMESPACE
 
-#ifndef QT_NO_BIG_CODECS
-
 static const uchar Ss2 = 0x8e;        // Single Shift 2
 static const uchar Ss3 = 0x8f;        // Single Shift 3
 
@@ -255,6 +253,5 @@ QByteArray QEucJpCodec::_name()
 {
     return "EUC-JP";
 }
-#endif // QT_NO_BIG_CODECS
 
 QT_END_NAMESPACE
diff --git a/src/corelib/codecs/qeucjpcodec_p.h b/src/corelib/codecs/qeucjpcodec_p.h
index f2a9f923c8..d79e2435e3 100644
--- a/src/corelib/codecs/qeucjpcodec_p.h
+++ b/src/corelib/codecs/qeucjpcodec_p.h
@@ -84,9 +84,9 @@
 #include <QtCore/qtextcodec.h>
 #include <QtCore/qlist.h>
 
-QT_BEGIN_NAMESPACE
+QT_REQUIRE_CONFIG(big_codecs);
 
-#ifndef QT_NO_BIG_CODECS
+QT_BEGIN_NAMESPACE
 
 class QEucJpCodec : public QTextCodec {
 public:
@@ -108,8 +108,6 @@ protected:
     const QJpUnicodeConv *conv;
 };
 
-#endif // QT_NO_BIG_CODECS
-
 QT_END_NAMESPACE
 
 #endif // QEUCJPCODEC_P_H
diff --git a/src/corelib/codecs/qeuckrcodec.cpp b/src/corelib/codecs/qeuckrcodec.cpp
index ec5253c7f9..47657cc01f 100644
--- a/src/corelib/codecs/qeuckrcodec.cpp
+++ b/src/corelib/codecs/qeuckrcodec.cpp
@@ -72,7 +72,6 @@
 
 QT_BEGIN_NAMESPACE
 
-#ifndef QT_NO_BIG_CODECS
 unsigned int qt_Ksc5601ToUnicode(unsigned int code);
 
 unsigned int qt_UnicodeToKsc5601(unsigned int unicode);
@@ -3523,6 +3522,4 @@ QString QCP949Codec::convertToUnicode(const char* chars, int len, ConverterState
     return result;
 }
 
-#endif // QT_NO_BIG_CODECS
-
 QT_END_NAMESPACE
diff --git a/src/corelib/codecs/qeuckrcodec_p.h b/src/corelib/codecs/qeuckrcodec_p.h
index bedf0cf822..6180548aab 100644
--- a/src/corelib/codecs/qeuckrcodec_p.h
+++ b/src/corelib/codecs/qeuckrcodec_p.h
@@ -80,9 +80,9 @@
 #include <QtCore/qtextcodec.h>
 #include <QtCore/qlist.h>
 
-QT_BEGIN_NAMESPACE
+QT_REQUIRE_CONFIG(big_codecs);
 
-#ifndef QT_NO_BIG_CODECS
+QT_BEGIN_NAMESPACE
 
 class QEucKrCodec : public QTextCodec {
 public:
@@ -112,8 +112,6 @@ public:
     QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const override;
 };
 
-#endif // QT_NO_BIG_CODECS
-
 QT_END_NAMESPACE
 
 #endif // QEUCKRCODEC_P_H
diff --git a/src/corelib/codecs/qgb18030codec.cpp b/src/corelib/codecs/qgb18030codec.cpp
index 04e4bef4cd..4206eacb6f 100644
--- a/src/corelib/codecs/qgb18030codec.cpp
+++ b/src/corelib/codecs/qgb18030codec.cpp
@@ -45,8 +45,6 @@
 
 #include "qgb18030codec_p.h"
 
-#ifndef QT_NO_BIG_CODECS
-
 QT_BEGIN_NAMESPACE
 
 #define InRange(c, lower, upper)  (((c) >= (lower)) && ((c) <= (upper)))
@@ -9116,5 +9114,3 @@ int qt_UnicodeToGbk(uint uni, uchar *gbchar) {
 }
 
 QT_END_NAMESPACE
-
-#endif // QT_NO_BIG_CODECS
diff --git a/src/corelib/codecs/qgb18030codec_p.h b/src/corelib/codecs/qgb18030codec_p.h
index 635150b18e..c263309357 100644
--- a/src/corelib/codecs/qgb18030codec_p.h
+++ b/src/corelib/codecs/qgb18030codec_p.h
@@ -57,9 +57,9 @@
 #include <QtCore/qtextcodec.h>
 #include <QtCore/qlist.h>
 
-QT_BEGIN_NAMESPACE
+QT_REQUIRE_CONFIG(big_codecs);
 
-#ifndef QT_NO_BIG_CODECS
+QT_BEGIN_NAMESPACE
 
 class QGb18030Codec : public QTextCodec {
 public:
@@ -108,8 +108,6 @@ public:
     QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const override;
 };
 
-#endif // QT_NO_BIG_CODECS
-
 QT_END_NAMESPACE
 
 #endif // QGB18030CODEC_P_H
diff --git a/src/corelib/codecs/qicucodec.cpp b/src/corelib/codecs/qicucodec.cpp
index ee9f1d0048..06a6d95e82 100644
--- a/src/corelib/codecs/qicucodec.cpp
+++ b/src/corelib/codecs/qicucodec.cpp
@@ -373,7 +373,7 @@ static QTextCodec *loadQtCodec(const char *name)
         return new QUtf32LECodec;
     if (!strcmp(name, "ISO-8859-16") || !strcmp(name, "latin10") || !strcmp(name, "iso-ir-226"))
         return new QSimpleTextCodec(13 /* == 8859-16*/);
-#ifndef QT_NO_CODECS
+#if QT_CONFIG(codecs)
     if (!strcmp(name, "TSCII"))
         return new QTsciiCodec;
     if (!qstrnicmp(name, "iscii", 5))
diff --git a/src/corelib/codecs/qisciicodec.cpp b/src/corelib/codecs/qisciicodec.cpp
index 499e8549a7..d9a86d77c7 100644
--- a/src/corelib/codecs/qisciicodec.cpp
+++ b/src/corelib/codecs/qisciicodec.cpp
@@ -40,8 +40,6 @@
 #include "qtextcodec_p.h"
 #include "qlist.h"
 
-#ifndef QT_NO_CODECS
-
 QT_BEGIN_NAMESPACE
 
 /*!
@@ -291,5 +289,3 @@ QString QIsciiCodec::convertToUnicode(const char* chars, int len, ConverterState
 }
 
 QT_END_NAMESPACE
-
-#endif // QT_NO_CODECS
diff --git a/src/corelib/codecs/qisciicodec_p.h b/src/corelib/codecs/qisciicodec_p.h
index f818e7d83e..2c1b3ca9e0 100644
--- a/src/corelib/codecs/qisciicodec_p.h
+++ b/src/corelib/codecs/qisciicodec_p.h
@@ -54,9 +54,9 @@
 #include <QtCore/private/qglobal_p.h>
 #include "QtCore/qtextcodec.h"
 
-QT_BEGIN_NAMESPACE
+QT_REQUIRE_CONFIG(codecs);
 
-#ifndef QT_NO_CODECS
+QT_BEGIN_NAMESPACE
 
 class QIsciiCodec : public QTextCodec {
 public:
@@ -75,8 +75,6 @@ private:
     int idx;
 };
 
-#endif // QT_NO_CODECS
-
 QT_END_NAMESPACE
 
 #endif // QISCIICODEC_P_H
diff --git a/src/corelib/codecs/qjiscodec.cpp b/src/corelib/codecs/qjiscodec.cpp
index a8625db054..77ec2adafd 100644
--- a/src/corelib/codecs/qjiscodec.cpp
+++ b/src/corelib/codecs/qjiscodec.cpp
@@ -52,7 +52,6 @@
 
 QT_BEGIN_NAMESPACE
 
-#ifndef QT_NO_BIG_CODECS
 enum {
     Esc = 0x1b,
     So = 0x0e,         // Shift Out
@@ -369,6 +368,4 @@ QList<QByteArray> QJisCodec::_aliases()
     return list;
 }
 
-#endif // QT_NO_BIG_CODECS
-
 QT_END_NAMESPACE
diff --git a/src/corelib/codecs/qjiscodec_p.h b/src/corelib/codecs/qjiscodec_p.h
index 1ffe4a63f6..41195af108 100644
--- a/src/corelib/codecs/qjiscodec_p.h
+++ b/src/corelib/codecs/qjiscodec_p.h
@@ -84,9 +84,9 @@
 #include <QtCore/qtextcodec.h>
 #include <QtCore/qlist.h>
 
-QT_BEGIN_NAMESPACE
+QT_REQUIRE_CONFIG(big_codecs);
 
-#ifndef QT_NO_BIG_CODECS
+QT_BEGIN_NAMESPACE
 
 class QJisCodec : public QTextCodec {
 public:
@@ -108,8 +108,6 @@ protected:
     const QJpUnicodeConv *conv;
 };
 
-#endif // QT_NO_BIG_CODECS
-
 QT_END_NAMESPACE
 
 #endif // QJISCODEC_P_H
diff --git a/src/corelib/codecs/qjpunicode.cpp b/src/corelib/codecs/qjpunicode.cpp
index 23112ce4d3..61f6eac93a 100644
--- a/src/corelib/codecs/qjpunicode.cpp
+++ b/src/corelib/codecs/qjpunicode.cpp
@@ -50,8 +50,6 @@
 
 QT_BEGIN_NAMESPACE
 
-#ifndef QT_NO_BIG_CODECS
-
 #define        USE_JISX0212
 
 #define        Q_STRICT
@@ -10734,6 +10732,4 @@ uint QJpUnicodeConv::unicodeToCp932(uint h, uint l) const
 \internal
 */
 
-#endif // QT_NO_BIG_CODECS
-
 QT_END_NAMESPACE
diff --git a/src/corelib/codecs/qjpunicode_p.h b/src/corelib/codecs/qjpunicode_p.h
index 4fa2b9f757..9d1cdf3bf0 100644
--- a/src/corelib/codecs/qjpunicode_p.h
+++ b/src/corelib/codecs/qjpunicode_p.h
@@ -82,9 +82,9 @@
 
 #include <QtCore/private/qglobal_p.h>
 
-QT_BEGIN_NAMESPACE
+QT_REQUIRE_CONFIG(big_codecs);
 
-#ifndef QT_NO_BIG_CODECS
+QT_BEGIN_NAMESPACE
 
 class QJpUnicodeConv {
 public:
@@ -180,8 +180,6 @@ private:
     int rule;
 };
 
-#endif // QT_NO_BIG_CODECS
-
 QT_END_NAMESPACE
 
 #endif // QJPUNICODE_P_H
diff --git a/src/corelib/codecs/qsjiscodec.cpp b/src/corelib/codecs/qsjiscodec.cpp
index ba342c9c53..4f5f9069cd 100644
--- a/src/corelib/codecs/qsjiscodec.cpp
+++ b/src/corelib/codecs/qsjiscodec.cpp
@@ -52,7 +52,6 @@
 
 QT_BEGIN_NAMESPACE
 
-#ifndef QT_NO_BIG_CODECS
 enum {
     Esc = 0x1b
 };
@@ -223,6 +222,5 @@ QList<QByteArray> QSjisCodec::_aliases()
          << "MS_Kanji";
     return list;
 }
-#endif // QT_NO_BIG_CODECS
 
 QT_END_NAMESPACE
diff --git a/src/corelib/codecs/qsjiscodec_p.h b/src/corelib/codecs/qsjiscodec_p.h
index 6257a7875c..1e5cd44f26 100644
--- a/src/corelib/codecs/qsjiscodec_p.h
+++ b/src/corelib/codecs/qsjiscodec_p.h
@@ -84,9 +84,9 @@
 #include <QtCore/qtextcodec.h>
 #include <QtCore/qlist.h>
 
-QT_BEGIN_NAMESPACE
+QT_REQUIRE_CONFIG(big_codecs);
 
-#ifndef QT_NO_BIG_CODECS
+QT_BEGIN_NAMESPACE
 
 class QSjisCodec : public QTextCodec {
 public:
@@ -108,8 +108,6 @@ protected:
     const QJpUnicodeConv *conv;
 };
 
-#endif // QT_NO_BIG_CODECS
-
 QT_END_NAMESPACE
 
 #endif // QSJISCODEC_P_H
diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp
index adb84a1856..fedd39e104 100644
--- a/src/corelib/codecs/qtextcodec.cpp
+++ b/src/corelib/codecs/qtextcodec.cpp
@@ -58,8 +58,10 @@
 #include "qlatincodec_p.h"
 
 #if !defined(QT_BOOTSTRAPPED)
+#if QT_CONFIG(codecs)
 #  include "qtsciicodec_p.h"
 #  include "qisciicodec_p.h"
+#endif
 #if QT_CONFIG(icu)
 #include "qicucodec_p.h"
 #else
@@ -70,7 +72,7 @@
 #  include "qwindowscodec_p.h"
 #endif
 #  include "qsimplecodec_p.h"
-#if !defined(QT_NO_BIG_CODECS)
+#if QT_CONFIG(big_codecs)
 #  ifndef Q_OS_INTEGRITY
 #    include "qgb18030codec_p.h"
 #    include "qeucjpcodec_p.h"
@@ -79,7 +81,7 @@
 #    include "qeuckrcodec_p.h"
 #    include "qbig5codec_p.h"
 #  endif // !Q_OS_INTEGRITY
-#endif // !QT_NO_BIG_CODECS
+#endif // big_codecs
 
 #endif // icu
 #endif // QT_BOOTSTRAPPED
@@ -269,14 +271,14 @@ static void setup()
         return;
     initialized = true;
 
-#if !defined(QT_NO_CODECS) && !defined(QT_BOOTSTRAPPED)
+#if QT_CONFIG(codecs) && !defined(QT_BOOTSTRAPPED)
     (void)new QTsciiCodec;
     for (int i = 0; i < 9; ++i)
         (void)new QIsciiCodec(i);
     for (int i = 0; i < QSimpleTextCodec::numSimpleCodecs; ++i)
         (void)new QSimpleTextCodec(i);
 
-#  if !defined(QT_NO_BIG_CODECS) && !defined(Q_OS_INTEGRITY)
+#  if QT_CONFIG(big_codecs) && !defined(Q_OS_INTEGRITY)
     (void)new QGb18030Codec;
     (void)new QGbkCodec;
     (void)new QGb2312Codec;
@@ -287,14 +289,14 @@ static void setup()
     (void)new QCP949Codec;
     (void)new QBig5Codec;
     (void)new QBig5hkscsCodec;
-#  endif // !QT_NO_BIG_CODECS && !Q_OS_INTEGRITY
+#  endif // big_codecs && !Q_OS_INTEGRITY
 #if QT_CONFIG(iconv)
     (void) new QIconvCodec;
 #endif
 #if defined(Q_OS_WIN32)
     (void) new QWindowsLocalCodec;
 #endif // Q_OS_WIN32
-#endif // !QT_NO_CODECS && !QT_BOOTSTRAPPED
+#endif // codecs && !QT_BOOTSTRAPPED
 
     (void)new QUtf16Codec;
     (void)new QUtf16BECodec;
diff --git a/src/corelib/codecs/qtsciicodec.cpp b/src/corelib/codecs/qtsciicodec.cpp
index 49f38d1789..936fc4206d 100644
--- a/src/corelib/codecs/qtsciicodec.cpp
+++ b/src/corelib/codecs/qtsciicodec.cpp
@@ -44,8 +44,6 @@
 #include "qtsciicodec_p.h"
 #include "qlist.h"
 
-#ifndef QT_NO_CODECS
-
 QT_BEGIN_NAMESPACE
 
 static unsigned char qt_UnicodeToTSCII(ushort u1, ushort u2, ushort u3);
@@ -493,5 +491,3 @@ static unsigned int qt_TSCIIToUnicode(uint code, uint *s)
 }
 
 QT_END_NAMESPACE
-
-#endif // QT_NO_CODECS
diff --git a/src/corelib/codecs/qtsciicodec_p.h b/src/corelib/codecs/qtsciicodec_p.h
index 78f9350a19..9247098e36 100644
--- a/src/corelib/codecs/qtsciicodec_p.h
+++ b/src/corelib/codecs/qtsciicodec_p.h
@@ -83,9 +83,9 @@
 #include <QtCore/private/qglobal_p.h>
 #include "QtCore/qtextcodec.h"
 
-QT_BEGIN_NAMESPACE
+QT_REQUIRE_CONFIG(codecs);
 
-#ifndef QT_NO_CODECS
+QT_BEGIN_NAMESPACE
 
 class QTsciiCodec : public QTextCodec {
 public:
@@ -98,8 +98,6 @@ public:
     QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const override;
 };
 
-#endif // QT_NO_CODECS
-
 QT_END_NAMESPACE
 
 #endif // QTSCIICODEC_P_H