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

 Conflicts:
	tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp

Added tests/auto/testlib/selftests/expected_crashes_5.txt to work
round the output of the crashes test (which exercises UB, see
QTBUG-73903) being truncated on one test platform.

Change-Id: I9cd3f2639b4e50c3c4513e14629a40bdca8f8273

3 files changed, 28 insertions, 24 deletions

diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp
index aa2d36423d..10df85f68e 100644
--- a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp
+++ b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp
@@ -1429,8 +1429,8 @@ QT_WARNING_POP
                     reinterpret_cast<const OS2Table *>(fontData.constData()
                                                        + qFromBigEndian<quint32>(os2TableEntry->offset));
 
-            bool italic = qFromBigEndian<quint16>(os2Table->selection) & 1;
-            bool oblique = qFromBigEndian<quint16>(os2Table->selection) & 128;
+            bool italic = qFromBigEndian<quint16>(os2Table->selection)  & (1 << 0);
+            bool oblique = qFromBigEndian<quint16>(os2Table->selection) & (1 << 9);
 
             if (italic)
                 fontEngine->fontDef.style = QFont::StyleItalic;
diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_ft.cpp b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_ft.cpp
index f68ea54dcf..db2186644b 100644
--- a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_ft.cpp
+++ b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_ft.cpp
@@ -115,30 +115,33 @@ static FontKeys &fontKeys()
 {
     static FontKeys result;
     if (result.isEmpty()) {
-        const QSettings fontRegistry(QStringLiteral("HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Fonts"),
-                                     QSettings::NativeFormat);
-        const QStringList allKeys = fontRegistry.allKeys();
-        const QString trueType = QStringLiteral("(TrueType)");
+        const QStringList keys = { QStringLiteral("HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Fonts"),
+                                   QStringLiteral("HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Fonts") };
+        for (const auto key : keys) {
+            const QSettings fontRegistry(key, QSettings::NativeFormat);
+            const QStringList allKeys = fontRegistry.allKeys();
+            const QString trueType = QStringLiteral("(TrueType)");
 #if QT_CONFIG(regularexpression)
-        const QRegularExpression sizeListMatch(QStringLiteral("\\s(\\d+,)+\\d+"));
+            const QRegularExpression sizeListMatch(QStringLiteral("\\s(\\d+,)+\\d+"));
 #else
-        const QRegExp sizeListMatch(QLatin1String("\\s(\\d+,)+\\d+"));
+            const QRegExp sizeListMatch(QLatin1String("\\s(\\d+,)+\\d+"));
 #endif
-        Q_ASSERT(sizeListMatch.isValid());
-        const int size = allKeys.size();
-        result.reserve(size);
-        for (int i = 0; i < size; ++i) {
-            FontKey fontKey;
-            const QString &registryFontKey = allKeys.at(i);
-            fontKey.fileName = fontRegistry.value(registryFontKey).toString();
-            QString realKey = registryFontKey;
-            realKey.remove(trueType);
-            realKey.remove(sizeListMatch);
-            const auto fontNames = QStringRef(&realKey).trimmed().split(QLatin1Char('&'));
-            fontKey.fontNames.reserve(fontNames.size());
-            for (const QStringRef &fontName : fontNames)
-                fontKey.fontNames.append(fontName.trimmed().toString());
-            result.append(fontKey);
+            Q_ASSERT(sizeListMatch.isValid());
+            const int size = allKeys.size();
+            result.reserve(result.size() + size);
+            for (int i = 0; i < size; ++i) {
+                FontKey fontKey;
+                const QString &registryFontKey = allKeys.at(i);
+                fontKey.fileName = fontRegistry.value(registryFontKey).toString();
+                QString realKey = registryFontKey;
+                realKey.remove(trueType);
+                realKey.remove(sizeListMatch);
+                const auto fontNames = QStringRef(&realKey).trimmed().split(QLatin1Char('&'));
+                fontKey.fontNames.reserve(fontNames.size());
+                for (const QStringRef &fontName : fontNames)
+                    fontKey.fontNames.append(fontName.trimmed().toString());
+                result.append(fontKey);
+            }
         }
     }
     return result;
diff --git a/src/platformsupport/glxconvenience/qglxconvenience.cpp b/src/platformsupport/glxconvenience/qglxconvenience.cpp
index 99ae2671dd..40521ef6da 100644
--- a/src/platformsupport/glxconvenience/qglxconvenience.cpp
+++ b/src/platformsupport/glxconvenience/qglxconvenience.cpp
@@ -241,7 +241,8 @@ GLXFBConfig qglx_findConfig(Display *display, int screen , QSurfaceFormat format
                 continue;
             if (requestedAlpha && actualAlpha < requestedAlpha)
                 continue;
-            compatibleCandidate = candidate;
+            if (!compatibleCandidate) // Only pick up the first compatible one offered by the server
+                compatibleCandidate = candidate;
 
             if (requestedRed && actualRed != requestedRed)
                 continue;