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

Change-Id: I0fe623517af28e408b642c879efd59f633ab63ac

15 files changed, 168 insertions, 26 deletions

diff --git a/src/3rdparty/angle/src/libANGLE/renderer/d3d/HLSLCompiler.cpp b/src/3rdparty/angle/src/libANGLE/renderer/d3d/HLSLCompiler.cpp
index b38765070b..5d47308d67 100644
--- a/src/3rdparty/angle/src/libANGLE/renderer/d3d/HLSLCompiler.cpp
+++ b/src/3rdparty/angle/src/libANGLE/renderer/d3d/HLSLCompiler.cpp
@@ -14,6 +14,10 @@
 #include "libANGLE/histogram_macros.h"
 #include "third_party/trace_event/trace_event.h"
 
+#ifndef QT_D3DCOMPILER_DLL
+#define QT_D3DCOMPILER_DLL D3DCOMPILER_DLL
+#endif
+
 #if ANGLE_APPEND_ASSEMBLY_TO_SHADER_DEBUG_INFO == ANGLE_ENABLED
 namespace
 {
@@ -130,6 +134,27 @@ gl::Error HLSLCompiler::ensureInitialized()
     }
 #endif  // ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES
 
+    // Load the compiler DLL specified by the environment, or default to QT_D3DCOMPILER_DLL
+    const wchar_t *defaultCompiler = _wgetenv(L"QT_D3DCOMPILER_DLL");
+    if (!defaultCompiler)
+        defaultCompiler = QT_D3DCOMPILER_DLL;
+
+    const wchar_t *compilerDlls[] = {
+        defaultCompiler,
+        L"d3dcompiler_47.dll",
+        L"d3dcompiler_46.dll",
+        L"d3dcompiler_43.dll",
+        0
+    };
+
+    // Load the first available known compiler DLL
+    for (int i = 0; compilerDlls[i]; ++i)
+    {
+        mD3DCompilerModule = LoadLibrary(compilerDlls[i]);
+        if (mD3DCompilerModule)
+            break;
+    }
+
     if (!mD3DCompilerModule)
     {
         // Load the version of the D3DCompiler DLL associated with the Direct3D version ANGLE was built with.
diff --git a/src/angle/patches/0012-ANGLE-Dynamically-load-D3D-compiler-from-a-list.patch b/src/angle/patches/0012-ANGLE-Dynamically-load-D3D-compiler-from-a-list.patch
new file mode 100644
index 0000000000..7009dec1ba
--- /dev/null
+++ b/src/angle/patches/0012-ANGLE-Dynamically-load-D3D-compiler-from-a-list.patch
@@ -0,0 +1,59 @@
+From dff9676c60c51fa7af0749e1cb54305f112183e3 Mon Sep 17 00:00:00 2001
+From: Oliver Wolff <oliver.wolff@qt.io>
+Date: Mon, 10 Dec 2018 08:33:14 +0100
+Subject: [PATCH] ANGLE: Dynamically load D3D compiler from a list
+
+If the default compiler cannot be found, load it from a list of DLL names,
+including a non-versioned proxy DLL provided by Qt. On Desktop Windows,
+the default compiler can also be specified by an environment variable,
+QT_D3DCOMPILER_DLL.
+---
+ src/3rdparty/angle/src/libANGLE/renderer/d3d/HLSLCompiler.cpp | 25 +++++++++++++++++++++++++
+ 1 file changed, 25 insertions(+)
+
+diff --git a/src/3rdparty/angle/src/libANGLE/renderer/d3d/HLSLCompiler.cpp b/src/3rdparty/angle/src/libANGLE/renderer/d3d/HLSLCompiler.cpp
+index b38765070..5d47308d6 100644
+--- a/src/3rdparty/angle/src/libANGLE/renderer/d3d/HLSLCompiler.cpp
++++ b/src/3rdparty/angle/src/libANGLE/renderer/d3d/HLSLCompiler.cpp
+@@ -14,6 +14,10 @@
+ #include "libANGLE/histogram_macros.h"
+ #include "third_party/trace_event/trace_event.h"
+ 
++#ifndef QT_D3DCOMPILER_DLL
++#define QT_D3DCOMPILER_DLL D3DCOMPILER_DLL
++#endif
++
+ #if ANGLE_APPEND_ASSEMBLY_TO_SHADER_DEBUG_INFO == ANGLE_ENABLED
+ namespace
+ {
+@@ -130,6 +134,27 @@ gl::Error HLSLCompiler::ensureInitialized()
+     }
+ #endif  // ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES
+ 
++    // Load the compiler DLL specified by the environment, or default to QT_D3DCOMPILER_DLL
++    const wchar_t *defaultCompiler = _wgetenv(L"QT_D3DCOMPILER_DLL");
++    if (!defaultCompiler)
++        defaultCompiler = QT_D3DCOMPILER_DLL;
++
++    const wchar_t *compilerDlls[] = {
++        defaultCompiler,
++        L"d3dcompiler_47.dll",
++        L"d3dcompiler_46.dll",
++        L"d3dcompiler_43.dll",
++        0
++    };
++
++    // Load the first available known compiler DLL
++    for (int i = 0; compilerDlls[i]; ++i)
++    {
++        mD3DCompilerModule = LoadLibrary(compilerDlls[i]);
++        if (mD3DCompilerModule)
++            break;
++    }
++
+     if (!mD3DCompilerModule)
+     {
+         // Load the version of the D3DCompiler DLL associated with the Direct3D version ANGLE was built with.
+-- 
+2.15.0.windows.1
+
diff --git a/src/corelib/codecs/qwindowscodec.cpp b/src/corelib/codecs/qwindowscodec.cpp
index 813d3c8153..6b703f7517 100644
--- a/src/corelib/codecs/qwindowscodec.cpp
+++ b/src/corelib/codecs/qwindowscodec.cpp
@@ -179,7 +179,7 @@ QString QWindowsLocalCodec::convertToUnicodeCharByChar(const char *chars, int le
 #else
     QString s;
     size_t size = mbstowcs(NULL, mb, length);
-    if (size < 0) {
+    if (size == size_t(-1)) {
         Q_ASSERT("Error in CE TextCodec");
         return QString();
     }
diff --git a/src/corelib/tools/qcollator.cpp b/src/corelib/tools/qcollator.cpp
index 1cf223aae6..4315d35a52 100644
--- a/src/corelib/tools/qcollator.cpp
+++ b/src/corelib/tools/qcollator.cpp
@@ -79,7 +79,6 @@ QT_BEGIN_NAMESPACE
 QCollator::QCollator(const QLocale &locale)
     : d(new QCollatorPrivate(locale))
 {
-    d->init();
 }
 
 /*!
@@ -323,6 +322,8 @@ bool QCollator::ignorePunctuation() const
     methods directly. But if the string is compared repeatedly (e.g. when sorting
     a whole list of strings), it's usually faster to create the sort keys for each
     string and then sort using the keys.
+
+    \note Not supported with the C (a.k.a. POSIX) locale on Darwin.
  */
 
 /*!
diff --git a/src/corelib/tools/qcollator_icu.cpp b/src/corelib/tools/qcollator_icu.cpp
index fd621983d3..ab45b9a1a1 100644
--- a/src/corelib/tools/qcollator_icu.cpp
+++ b/src/corelib/tools/qcollator_icu.cpp
@@ -55,6 +55,8 @@ QT_BEGIN_NAMESPACE
 void QCollatorPrivate::init()
 {
     cleanup();
+    if (isC())
+        return;
 
     UErrorCode status = U_ZERO_ERROR;
     QByteArray name = QLocalePrivate::get(locale)->bcp47Name('_');
@@ -140,6 +142,8 @@ QCollatorSortKey QCollator::sortKey(const QString &string) const
 {
     if (d->dirty)
         d->init();
+    if (d->isC())
+        return QCollatorSortKey(new QCollatorSortKeyPrivate(string.toUtf8()));
 
     if (d->collator) {
         QByteArray result(16 + string.size() + (string.size() >> 2), Qt::Uninitialized);
diff --git a/src/corelib/tools/qcollator_macx.cpp b/src/corelib/tools/qcollator_macx.cpp
index 9aa59a81dc..42e67e0c12 100644
--- a/src/corelib/tools/qcollator_macx.cpp
+++ b/src/corelib/tools/qcollator_macx.cpp
@@ -55,6 +55,15 @@ QT_BEGIN_NAMESPACE
 void QCollatorPrivate::init()
 {
     cleanup();
+    /*
+      LocaleRefFromLocaleString() will accept "POSIX" as the locale name, but
+      the locale it produces (named "pos") doesn't implement the [A-Z] < [a-z]
+      behavior we expect of the C locale.  We can use QStringView to get round
+      that for collation, but this leaves no way to do a sort key.
+    */
+    if (isC())
+        return;
+
     LocaleRef localeRef;
     int rc = LocaleRefFromLocaleString(QLocalePrivate::get(locale)->bcp47Name().constData(), &localeRef);
     if (rc != 0)
@@ -92,6 +101,8 @@ int QCollator::compare(const QChar *s1, int len1, const QChar *s2, int len2) con
 {
     if (d->dirty)
         d->init();
+    if (!d->collator)
+        return QStringView(s1, len1).compare(QStringView(s2, len2), caseSensitivity());
 
     SInt32 result;
     Boolean equivalent;
@@ -104,6 +115,7 @@ int QCollator::compare(const QChar *s1, int len1, const QChar *s2, int len2) con
         return 0;
     return result < 0 ? -1 : 1;
 }
+
 int QCollator::compare(const QString &str1, const QString &str2) const
 {
     return compare(str1.constData(), str1.size(), str2.constData(), str2.size());
@@ -118,6 +130,11 @@ QCollatorSortKey QCollator::sortKey(const QString &string) const
 {
     if (d->dirty)
         d->init();
+    if (!d->collator) {
+        // What should (or even *can*) we do here ? (See init()'s comment.)
+        qWarning("QCollator doesn't support sort keys for the C locale on Darwin");
+        return QCollatorSortKey(nullptr);
+    }
 
     //Documentation recommends having it 5 times as big as the input
     QVector<UCCollationValue> ret(string.size() * 5);
@@ -136,6 +153,9 @@ QCollatorSortKey QCollator::sortKey(const QString &string) const
 
 int QCollatorSortKey::compare(const QCollatorSortKey &key) const
 {
+    if (!d.data())
+        return 0;
+
     SInt32 order;
     UCCompareCollationKeys(d->m_key.data(), d->m_key.size(),
                            key.d->m_key.data(), key.d->m_key.size(),
diff --git a/src/corelib/tools/qcollator_p.h b/src/corelib/tools/qcollator_p.h
index 321e846884..fc2d434a8d 100644
--- a/src/corelib/tools/qcollator_p.h
+++ b/src/corelib/tools/qcollator_p.h
@@ -110,6 +110,7 @@ public:
 
     QCollatorPrivate(const QLocale &locale) : locale(locale) {}
     ~QCollatorPrivate() { cleanup(); }
+    bool isC() { return locale.language() == QLocale::C; }
 
     void clear() {
         cleanup();
diff --git a/src/corelib/tools/qcollator_posix.cpp b/src/corelib/tools/qcollator_posix.cpp
index 42413a4a82..81f97a02e1 100644
--- a/src/corelib/tools/qcollator_posix.cpp
+++ b/src/corelib/tools/qcollator_posix.cpp
@@ -48,10 +48,12 @@ QT_BEGIN_NAMESPACE
 
 void QCollatorPrivate::init()
 {
-    if (locale != QLocale())
-        qWarning("Only default locale supported with the posix collation implementation");
-    if (caseSensitivity != Qt::CaseSensitive)
-        qWarning("Case insensitive sorting unsupported in the posix collation implementation");
+    if (!isC()) {
+        if (locale != QLocale())
+            qWarning("Only C and default locale supported with the posix collation implementation");
+        if (caseSensitivity != Qt::CaseSensitive)
+            qWarning("Case insensitive sorting unsupported in the posix collation implementation");
+    }
     if (numericMode)
         qWarning("Numeric mode unsupported in the posix collation implementation");
     if (ignorePunctuation)
@@ -73,14 +75,16 @@ static void stringToWCharArray(QVarLengthArray<wchar_t> &ret, const QString &str
 
 int QCollator::compare(const QChar *s1, int len1, const QChar *s2, int len2) const
 {
-    QVarLengthArray<wchar_t> array1, array2;
-    stringToWCharArray(array1, QString(s1, len1));
-    stringToWCharArray(array2, QString(s2, len2));
-    return std::wcscoll(array1.constData(), array2.constData());
+    return compare(QString::fromRawData(s1, len1), QString::fromRawData(s2, len2));
 }
 
 int QCollator::compare(const QString &s1, const QString &s2) const
 {
+    if (d->isC())
+        return s1.compare(s2, caseSensitivity());
+    if (d->dirty)
+        d->init();
+
     QVarLengthArray<wchar_t> array1, array2;
     stringToWCharArray(array1, s1);
     stringToWCharArray(array2, s2);
@@ -89,10 +93,7 @@ int QCollator::compare(const QString &s1, const QString &s2) const
 
 int QCollator::compare(const QStringRef &s1, const QStringRef &s2) const
 {
-    if (d->dirty)
-        d->init();
-
-    return compare(s1.constData(), s1.size(), s2.constData(), s2.size());
+    return compare(s1.toString(), s2.toString());
 }
 
 QCollatorSortKey QCollator::sortKey(const QString &string) const
@@ -102,14 +103,18 @@ QCollatorSortKey QCollator::sortKey(const QString &string) const
 
     QVarLengthArray<wchar_t> original;
     stringToWCharArray(original, string);
-    QVector<wchar_t> result(string.size());
-    size_t size = std::wcsxfrm(result.data(), original.constData(), string.size());
-    if (size > uint(result.size())) {
+    QVector<wchar_t> result(original.size());
+    if (d->isC()) {
+        std::copy(original.cbegin(), original.cend(), result.begin());
+    } else {
+        size_t size = std::wcsxfrm(result.data(), original.constData(), string.size());
+        if (size > uint(result.size())) {
+            result.resize(size+1);
+            size = std::wcsxfrm(result.data(), original.constData(), string.size());
+        }
         result.resize(size+1);
-        size = std::wcsxfrm(result.data(), original.constData(), string.size());
+        result[size] = 0;
     }
-    result.resize(size+1);
-    result[size] = 0;
     return QCollatorSortKey(new QCollatorSortKeyPrivate(std::move(result)));
 }
 
diff --git a/src/corelib/tools/qcollator_win.cpp b/src/corelib/tools/qcollator_win.cpp
index 5a838c1b50..35142bb8b8 100644
--- a/src/corelib/tools/qcollator_win.cpp
+++ b/src/corelib/tools/qcollator_win.cpp
@@ -60,6 +60,8 @@ extern LCID qt_inIsoNametoLCID(const char *name);
 void QCollatorPrivate::init()
 {
     collator = 0;
+    if (isC())
+        return;
 
 #ifndef USE_COMPARESTRINGEX
     localeID = qt_inIsoNametoLCID(QLocalePrivate::get(locale)->bcp47Name().constData());
@@ -86,6 +88,9 @@ void QCollatorPrivate::cleanup()
 
 int QCollator::compare(const QChar *s1, int len1, const QChar *s2, int len2) const
 {
+    if (d->isC())
+        return QString::compare_helper(s1, len1, s2, len2, d->caseSensitivity);
+
     if (d->dirty)
         d->init();
 
@@ -119,6 +124,8 @@ QCollatorSortKey QCollator::sortKey(const QString &string) const
 {
     if (d->dirty)
         d->init();
+    if (d->isC())
+        return QCollatorSortKey(new QCollatorSortKeyPrivate(string));
 
 #ifndef USE_COMPARESTRINGEX
     int size = LCMapStringW(d->localeID, LCMAP_SORTKEY | d->collator,
diff --git a/src/gui/doc/snippets/code/src_gui_vulkan_qvulkaninstance.cpp b/src/gui/doc/snippets/code/src_gui_vulkan_qvulkaninstance.cpp
index 50afe7c0ff..c4dd9fea18 100644
--- a/src/gui/doc/snippets/code/src_gui_vulkan_qvulkaninstance.cpp
+++ b/src/gui/doc/snippets/code/src_gui_vulkan_qvulkaninstance.cpp
@@ -102,7 +102,7 @@
         }
 
         bool event(QEvent *e) {
-            if (e->type == QEvent::UpdateRequest)
+            if (e->type() == QEvent::UpdateRequest)
                 render();
             return QWindow::event(e);
         }
diff --git a/src/gui/image/qpixmap_win.cpp b/src/gui/image/qpixmap_win.cpp
index 68d204d76e..3a2db74098 100644
--- a/src/gui/image/qpixmap_win.cpp
+++ b/src/gui/image/qpixmap_win.cpp
@@ -422,8 +422,11 @@ static QImage imageFromWinHBITMAP_GetDiBits(HBITMAP bitmap, bool forceQuads, int
     if (info.bmiHeader.biHeight > 0) // Force top-down
         info.bmiHeader.biHeight = -info.bmiHeader.biHeight;
     info.bmiHeader.biCompression = BI_RGB; // Extract using no compression (can be BI_BITFIELD)
-    if (forceQuads)
+    size_t allocSize = info.bmiHeader.biSizeImage;
+    if (forceQuads) {
        info.bmiHeader.biBitCount = 32;
+       allocSize = info.bmiHeader.biWidth * qAbs(info.bmiHeader.biHeight) * 4;
+    }
 
     const QImage::Format imageFormat = imageFromWinHBITMAP_Format(info.bmiHeader, hbitmapFormat);
     if (imageFormat == QImage::Format_Invalid) {
@@ -431,7 +434,7 @@ static QImage imageFromWinHBITMAP_GetDiBits(HBITMAP bitmap, bool forceQuads, int
         return QImage();
     }
 
-    QScopedPointer<uchar> data(new uchar[info.bmiHeader.biSizeImage]);
+    QScopedArrayPointer<uchar> data(new uchar[allocSize]);
     if (!GetDIBits(displayDc, bitmap, 0, qAbs(info.bmiHeader.biHeight), data.data(), &info, DIB_RGB_COLORS)) {
         qErrnoWarning("%s: GetDIBits() failed to get data.", __FUNCTION__);
         return QImage();
diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp
index 729029e233..650fffbd76 100644
--- a/src/gui/painting/qpaintengine_raster.cpp
+++ b/src/gui/painting/qpaintengine_raster.cpp
@@ -997,6 +997,10 @@ void QRasterPaintEnginePrivate::drawImage(const QPointF &pt,
 {
     if (alpha == 0 || !clip.isValid())
         return;
+    if (pt.x() > qreal(clip.right()) || pt.y() > qreal(clip.bottom()))
+        return;
+    if ((pt.x() + img.width()) < qreal(clip.left()) || (pt.y() + img.height()) < qreal(clip.top()))
+        return;
 
     Q_ASSERT(img.depth() >= 8);
 
@@ -1063,6 +1067,10 @@ void QRasterPaintEnginePrivate::blitImage(const QPointF &pt,
 {
     if (!clip.isValid())
         return;
+    if (pt.x() > qreal(clip.right()) || pt.y() > qreal(clip.bottom()))
+        return;
+    if ((pt.x() + img.width()) < qreal(clip.left()) || (pt.y() + img.height()) < qreal(clip.top()))
+        return;
 
     Q_ASSERT(img.depth() >= 8);
 
diff --git a/src/plugins/platforms/offscreen/qoffscreenintegration.cpp b/src/plugins/platforms/offscreen/qoffscreenintegration.cpp
index 01cd254501..9815be16a3 100644
--- a/src/plugins/platforms/offscreen/qoffscreenintegration.cpp
+++ b/src/plugins/platforms/offscreen/qoffscreenintegration.cpp
@@ -45,6 +45,7 @@
 #include <QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h>
 #if defined(Q_OS_MAC)
 #include <qpa/qplatformfontdatabase.h>
+#include <QtFontDatabaseSupport/private/qcoretextfontdatabase_p.h>
 #else
 #include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h>
 #endif
@@ -67,6 +68,8 @@
 
 QT_BEGIN_NAMESPACE
 
+class QCoreTextFontEngine;
+
 template <typename BaseEventDispatcher>
 class QOffscreenEventDispatcher : public BaseEventDispatcher
 {
@@ -101,7 +104,7 @@ QOffscreenIntegration::QOffscreenIntegration()
 {
 #if defined(Q_OS_UNIX)
 #if defined(Q_OS_MAC)
-    m_fontDatabase.reset(new QPlatformFontDatabase());
+    m_fontDatabase.reset(new QCoreTextFontDatabaseEngineFactory<QCoreTextFontEngine>);
 #else
     m_fontDatabase.reset(new QGenericUnixFontDatabase());
 #endif
diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp
index 69496dbd29..eb3479b3e0 100644
--- a/src/widgets/dialogs/qfiledialog.cpp
+++ b/src/widgets/dialogs/qfiledialog.cpp
@@ -2866,7 +2866,11 @@ void QFileDialogPrivate::init(const QUrl &directory, const QString &nameFilter,
     q->setFileMode(QFileDialog::AnyFile);
     if (!nameFilter.isEmpty())
         q->setNameFilter(nameFilter);
+    // QTBUG-70798, prevent the default blocking the restore logic.
+    const bool dontStoreDir = !directory.isValid() && !lastVisitedDir()->isValid();
     q->setDirectoryUrl(workingDirectory(directory));
+    if (dontStoreDir)
+        lastVisitedDir()->clear();
     if (directory.isLocalFile())
         q->selectFile(initialSelection(directory));
     else
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp
index 40b0af359c..595bdf621d 100644
--- a/src/widgets/kernel/qapplication.cpp
+++ b/src/widgets/kernel/qapplication.cpp
@@ -1064,8 +1064,10 @@ QStyle *QApplication::style()
         if (!QApplicationPrivate::styleOverride.isEmpty()) {
             const QString style = QApplicationPrivate::styleOverride.toLower();
             app_style = QStyleFactory::create(style);
-            if (!app_style)
-                qWarning("QApplication: invalid style override passed, ignoring it.");
+            if (Q_UNLIKELY(!app_style)) {
+                qWarning("QApplication: invalid style override passed, ignoring it.\n"
+                "    Available styles: %s", qPrintable(QStyleFactory::keys().join(QLatin1String(", "))));
+            }
         }
         if (!app_style)
             app_style = QStyleFactory::create(QApplicationPrivate::desktopStyleKey());