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

4 files changed, 24 insertions, 11 deletions

diff --git a/src/platformsupport/clipboard/qmacmime.mm b/src/platformsupport/clipboard/qmacmime.mm
index caa2ccc6e5..f425e34b39 100644
--- a/src/platformsupport/clipboard/qmacmime.mm
+++ b/src/platformsupport/clipboard/qmacmime.mm
@@ -418,8 +418,10 @@ QVariant QMacPasteboardMimeUnicodeText::convertToMime(const QString &mimetype, Q
     QVariant ret;
     if (flavor == QLatin1String("public.utf8-plain-text")) {
         ret = QString::fromUtf8(firstData);
+#if QT_CONFIG(textcodec)
     } else if (flavor == QLatin1String("public.utf16-plain-text")) {
         ret = QTextCodec::codecForName("UTF-16")->toUnicode(firstData);
+#endif
     } else {
         qWarning("QMime::convertToMime: unhandled mimetype: %s", qPrintable(mimetype));
     }
@@ -432,8 +434,10 @@ QList<QByteArray> QMacPasteboardMimeUnicodeText::convertFromMime(const QString &
     QString string = data.toString();
     if (flavor == QLatin1String("public.utf8-plain-text"))
         ret.append(string.toUtf8());
+#if QT_CONFIG(textcodec)
     else if (flavor == QLatin1String("public.utf16-plain-text"))
         ret.append(QTextCodec::codecForName("UTF-16")->fromUnicode(string));
+#endif
     return ret;
 }
 
diff --git a/src/platformsupport/fbconvenience/qfbcursor.cpp b/src/platformsupport/fbconvenience/qfbcursor.cpp
index 7daf3f4d0c..e0f6b69e77 100644
--- a/src/platformsupport/fbconvenience/qfbcursor.cpp
+++ b/src/platformsupport/fbconvenience/qfbcursor.cpp
@@ -63,9 +63,9 @@ QFbCursor::QFbCursor(QFbScreen *screen)
       mCursorImage(nullptr),
       mDeviceListener(nullptr)
 {
-    QByteArray hideCursorVal = qgetenv("QT_QPA_FB_HIDECURSOR");
-    if (!hideCursorVal.isEmpty())
-        mVisible = hideCursorVal.toInt() == 0;
+    const char *envVar = "QT_QPA_FB_HIDECURSOR";
+    if (qEnvironmentVariableIsSet(envVar))
+        mVisible = qEnvironmentVariableIntValue(envVar) == 0;
     if (!mVisible)
         return;
 
@@ -83,7 +83,7 @@ QFbCursor::~QFbCursor()
     delete mDeviceListener;
 }
 
-QRect QFbCursor::getCurrentRect()
+QRect QFbCursor::getCurrentRect() const
 {
     QRect rect = mCursorImage->image()->rect().translated(-mCursorImage->hotspot().x(),
                                                           -mCursorImage->hotspot().y());
@@ -102,6 +102,8 @@ void QFbCursor::setPos(const QPoint &pos)
 {
     QGuiApplicationPrivate::inputDeviceManager()->setCursorPos(pos);
     m_pos = pos;
+    if (!mVisible)
+        return;
     mCurrentRect = getCurrentRect();
     if (mOnScreen || mScreen->geometry().intersects(mCurrentRect.translated(mScreen->geometry().topLeft())))
         setDirty();
@@ -112,6 +114,8 @@ void QFbCursor::pointerEvent(const QMouseEvent &e)
     if (e.type() != QEvent::MouseMove)
         return;
     m_pos = e.screenPos().toPoint();
+    if (!mVisible)
+        return;
     mCurrentRect = getCurrentRect();
     if (mOnScreen || mScreen->geometry().intersects(mCurrentRect.translated(mScreen->geometry().topLeft())))
         setDirty();
@@ -149,23 +153,28 @@ QRect QFbCursor::dirtyRect()
 
 void QFbCursor::setCursor(Qt::CursorShape shape)
 {
-    mCursorImage->set(shape);
+    if (mCursorImage)
+        mCursorImage->set(shape);
 }
 
 void QFbCursor::setCursor(const QImage &image, int hotx, int hoty)
 {
-    mCursorImage->set(image, hotx, hoty);
+    if (mCursorImage)
+        mCursorImage->set(image, hotx, hoty);
 }
 
 void QFbCursor::setCursor(const uchar *data, const uchar *mask, int width, int height, int hotX, int hotY)
 {
-    mCursorImage->set(data, mask, width, height, hotX, hotY);
+    if (mCursorImage)
+        mCursorImage->set(data, mask, width, height, hotX, hotY);
 }
 
 #ifndef QT_NO_CURSOR
 void QFbCursor::changeCursor(QCursor * widgetCursor, QWindow *window)
 {
     Q_UNUSED(window);
+    if (!mVisible)
+        return;
     const Qt::CursorShape shape = widgetCursor ? widgetCursor->shape() : Qt::ArrowCursor;
 
     if (shape == Qt::BitmapCursor) {
@@ -196,7 +205,7 @@ void QFbCursor::setDirty()
 
 void QFbCursor::updateMouseStatus()
 {
-    mVisible = mDeviceListener->hasMouse();
+    mVisible = mDeviceListener ? mDeviceListener->hasMouse() : false;
     mScreen->setDirty(mVisible ? getCurrentRect() : lastPainted());
 }
 
diff --git a/src/platformsupport/fbconvenience/qfbcursor_p.h b/src/platformsupport/fbconvenience/qfbcursor_p.h
index beda10a5f3..cc36a2411b 100644
--- a/src/platformsupport/fbconvenience/qfbcursor_p.h
+++ b/src/platformsupport/fbconvenience/qfbcursor_p.h
@@ -105,7 +105,7 @@ private:
     void setCursor(const uchar *data, const uchar *mask, int width, int height, int hotX, int hotY);
     void setCursor(Qt::CursorShape shape);
     void setCursor(const QImage &image, int hotx, int hoty);
-    QRect getCurrentRect();
+    QRect getCurrentRect() const;
 
     bool mVisible;
     QFbScreen *mScreen;
diff --git a/src/platformsupport/input/libinput/qlibinputkeyboard.cpp b/src/platformsupport/input/libinput/qlibinputkeyboard.cpp
index 5152725468..2524066301 100644
--- a/src/platformsupport/input/libinput/qlibinputkeyboard.cpp
+++ b/src/platformsupport/input/libinput/qlibinputkeyboard.cpp
@@ -269,11 +269,11 @@ int QLibInputKeyboard::keysymToQtKey(xkb_keysym_t key) const
 int QLibInputKeyboard::keysymToQtKey(xkb_keysym_t keysym, Qt::KeyboardModifiers *modifiers, const QString &text) const
 {
     int code = 0;
-#ifndef QT_NO_TEXTCODEC
+#if QT_CONFIG(textcodec)
     QTextCodec *systemCodec = QTextCodec::codecForLocale();
 #endif
     if (keysym < 128 || (keysym < 256
-#ifndef QT_NO_TEXTCODEC
+#if QT_CONFIG(textcodec)
                          && systemCodec->mibEnum() == 4
 #endif
                          )) {