Merge remote-tracking branch 'origin/5.3' into 5.4

Manually included changes from
3a347a4e70e5a10ee92dd2578316c926a399e894
in src/opengl/qgl.cpp.

Conflicts:
	src/opengl/qgl_qpa.cpp
	src/plugins/platforms/android/androidjnimain.cpp

Change-Id: Ic26b58ee587d4884c9d0fba45c5a94b5a45ee929

1 files changed, 2 insertions, 0 deletions

diff --git a/src/plugins/platforms/windows/qwindowsfontengine.cpp b/src/plugins/platforms/windows/qwindowsfontengine.cpp
index d3cbea0b92..35b7f13ea4 100644
--- a/src/plugins/platforms/windows/qwindowsfontengine.cpp
+++ b/src/plugins/platforms/windows/qwindowsfontengine.cpp
@@ -1345,6 +1345,7 @@ void QWindowsMultiFontEngine::loadEngine(int at)
                                                                                         fontEngine->fontDef.pixelSize,
                                                                                         data);
                 fedw->fontDef = fontDef;
+                fedw->fontDef.family = fam;
                 fedw->ref.ref();
                 engines[at] = fedw;
 
@@ -1370,6 +1371,7 @@ void QWindowsMultiFontEngine::loadEngine(int at)
     engines[at] = new QWindowsFontEngine(fam, hfont, stockFont, lf, data);
     engines[at]->ref.ref();
     engines[at]->fontDef = fontDef;
+    engines[at]->fontDef.family = fam;
     qCDebug(lcQpaFonts) << __FUNCTION__ << at << fam;
 
     // TODO: increase cost in QFontCache for the font engine loaded here