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

5 files changed, 20 insertions, 16 deletions

diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index 965d65fb5d..e100ec8186 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -55,7 +55,6 @@
 #include <qmutex.h>
 #include <private/qloggingregistry_p.h>
 #include <qstandardpaths.h>
-#include <qtextcodec.h>
 #ifndef QT_NO_QOBJECT
 #include <qthread.h>
 #include <qthreadstorage.h>
diff --git a/src/corelib/kernel/qcoreglobaldata.cpp b/src/corelib/kernel/qcoreglobaldata.cpp
index 88a45ef4ee..104be1b87b 100644
--- a/src/corelib/kernel/qcoreglobaldata.cpp
+++ b/src/corelib/kernel/qcoreglobaldata.cpp
@@ -38,7 +38,9 @@
 ****************************************************************************/
 
 #include "qcoreglobaldata_p.h"
+#if QT_CONFIG(textcodec)
 #include "qtextcodec.h"
+#endif
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/corelib/kernel/qcoreglobaldata_p.h b/src/corelib/kernel/qcoreglobaldata_p.h
index c3c2f7b4a4..fda6b52b6e 100644
--- a/src/corelib/kernel/qcoreglobaldata_p.h
+++ b/src/corelib/kernel/qcoreglobaldata_p.h
@@ -57,7 +57,9 @@
 #include "QtCore/qreadwritelock.h"
 #include "QtCore/qhash.h"
 #include "QtCore/qbytearray.h"
+#if QT_CONFIG(textcodec)
 #include "QtCore/qtextcodec.h"
+#endif
 #include "QtCore/qmutex.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/corelib/kernel/qmimedata.cpp b/src/corelib/kernel/qmimedata.cpp
index 73307e925a..c8ad1bc43f 100644
--- a/src/corelib/kernel/qmimedata.cpp
+++ b/src/corelib/kernel/qmimedata.cpp
@@ -42,7 +42,9 @@
 #include "private/qobject_p.h"
 #include "qurl.h"
 #include "qstringlist.h"
+#if QT_CONFIG(textcodec)
 #include "qtextcodec.h"
+#endif
 
 QT_BEGIN_NAMESPACE
 
@@ -150,7 +152,7 @@ QVariant QMimeDataPrivate::retrieveTypedData(const QString &format, QVariant::Ty
     if (data.type() == QVariant::ByteArray) {
         // see if we can convert to the requested type
         switch(type) {
-#ifndef QT_NO_TEXTCODEC
+#if QT_CONFIG(textcodec)
         case QVariant::String: {
             const QByteArray ba = data.toByteArray();
             QTextCodec *codec = QTextCodec::codecForName("utf-8");
@@ -158,7 +160,7 @@ QVariant QMimeDataPrivate::retrieveTypedData(const QString &format, QVariant::Ty
                 codec = QTextCodec::codecForHtml(ba, codec);
             return codec->toUnicode(ba);
         }
-#endif // QT_NO_TEXTCODEC
+#endif // textcodec
         case QVariant::Color: {
             QVariant newData = data;
             newData.convert(QVariant::Color);
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index 8dbccfec3d..d2a3d957e9 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -2514,22 +2514,21 @@ bool QObject::isSignalConnected(const QMetaMethod &signal) const
     signalIndex += QMetaObjectPrivate::signalOffset(signal.mobj);
 
     QMutexLocker locker(signalSlotLock(this));
-    if (!d->connectionLists)
-        return false;
-
-    if (signalIndex < sizeof(d->connectedSignals) * 8 && !d->connectionLists->dirty)
-        return d->isSignalConnected(signalIndex);
+    if (d->connectionLists) {
+        if (signalIndex < sizeof(d->connectedSignals) * 8 && !d->connectionLists->dirty)
+            return d->isSignalConnected(signalIndex);
 
-    if (signalIndex < uint(d->connectionLists->count())) {
-        const QObjectPrivate::Connection *c =
-            d->connectionLists->at(signalIndex).first;
-        while (c) {
-            if (c->receiver)
-                return true;
-            c = c->nextConnectionList;
+        if (signalIndex < uint(d->connectionLists->count())) {
+            const QObjectPrivate::Connection *c =
+                d->connectionLists->at(signalIndex).first;
+            while (c) {
+                if (c->receiver)
+                    return true;
+                c = c->nextConnectionList;
+            }
         }
     }
-    return false;
+    return d->isDeclarativeSignalConnected(signalIndex);
 }
 
 /*!