4 files changed, 13 insertions, 5 deletions
diff --git a/src/gui/painting/qplatformbackingstore.cpp b/src/gui/painting/qplatformbackingstore.cpp
index 601dc97be1..45e90bd99b 100644
--- a/src/gui/painting/qplatformbackingstore.cpp
+++ b/src/gui/painting/qplatformbackingstore.cpp
@@ -338,7 +338,16 @@ void QPlatformBackingStore::composeAndFlush(QWindow *window, const QRegion &regi
         }
     }
 
-    if (!d_ptr->context->makeCurrent(window)) {
+    bool current = d_ptr->context->makeCurrent(window);
+
+    if (!current && !d_ptr->context->isValid()) {
+        delete d_ptr->blitter;
+        d_ptr->blitter = nullptr;
+        d_ptr->textureId = 0;
+        current = d_ptr->context->create() && d_ptr->context->makeCurrent(window);
+    }
+
+    if (!current) {
         qCWarning(lcQpaBackingStore, "composeAndFlush: makeCurrent() failed");
         return;
     }
diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp
index efc79a1783..76fde5388c 100644
--- a/src/gui/text/qfont.cpp
+++ b/src/gui/text/qfont.cpp
@@ -3176,8 +3176,7 @@ QDebug operator<<(QDebug stream, const QFont &font)
     QDebug debug(&fontDescription);
     debug.nospace();
 
-    QFontPrivate priv;
-    const QFont defaultFont(&priv);
+    const QFont defaultFont(new QFontPrivate);
 
     for (int property = QFont::FamilyResolved; property < QFont::AllPropertiesResolved; property <<= 1) {
         const bool resolved = (font.resolve_mask & property) != 0;
diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp
index ce6bb0c347..261e1d831b 100644
--- a/src/gui/text/qfontdatabase.cpp
+++ b/src/gui/text/qfontdatabase.cpp
@@ -2684,7 +2684,7 @@ QFontEngine *QFontDatabase::findFont(const QFontDef &request, int script)
     QtFontDesc desc;
     QList<int> blackListed;
     int index = match(multi ? QChar::Script_Common : script, request, family_name, foundry_name, &desc, blackListed);
-    if (index < 0 && QGuiApplicationPrivate::platformIntegration()->fontDatabase()->populateFamilyAliases()) {
+    if (index < 0 && QGuiApplicationPrivate::platformIntegration()->fontDatabase()->populateFamilyAliases(family_name)) {
         // We populated familiy aliases (e.g. localized families), so try again
         index = match(multi ? QChar::Script_Common : script, request, family_name, foundry_name, &desc, blackListed);
     }
diff --git a/src/gui/text/qplatformfontdatabase.h b/src/gui/text/qplatformfontdatabase.h
index 38ba7f10b2..f79c5db625 100644
--- a/src/gui/text/qplatformfontdatabase.h
+++ b/src/gui/text/qplatformfontdatabase.h
@@ -104,7 +104,7 @@ class Q_GUI_EXPORT QPlatformFontDatabase
 public:
     virtual ~QPlatformFontDatabase();
     virtual void populateFontDatabase();
-    virtual bool populateFamilyAliases() { return false; }
+    virtual bool populateFamilyAliases(const QString &missingFamily) { Q_UNUSED(missingFamily); return false; }
     virtual void populateFamily(const QString &familyName);
     virtual void invalidate();