Merge 5.13 into 5.13.0

Change-Id: I98e2b93d78dba1cbf746c39a0b5877d5e72c91fc

7 files changed, 30 insertions, 9 deletions

diff --git a/src/plugins/platforms/wasm/qtloader.js b/src/plugins/platforms/wasm/qtloader.js
index 2db7723ae2..4752a1dcee 100644
--- a/src/plugins/platforms/wasm/qtloader.js
+++ b/src/plugins/platforms/wasm/qtloader.js
@@ -404,7 +404,7 @@ function QtLoader(config)
         Module.preRun = Module.preRun || []
         Module.preRun.push(function() {
             for (var [key, value] of Object.entries(config.environment)) {
-                Module.ENV[key.toUpperCase()] = value;
+                ENV[key.toUpperCase()] = value;
             }
         });
 
diff --git a/src/plugins/platforms/wasm/qwasmeventtranslator.cpp b/src/plugins/platforms/wasm/qwasmeventtranslator.cpp
index c5c12e9f87..6a02a457a0 100644
--- a/src/plugins/platforms/wasm/qwasmeventtranslator.cpp
+++ b/src/plugins/platforms/wasm/qwasmeventtranslator.cpp
@@ -568,11 +568,8 @@ void QWasmEventTranslator::processMouse(int eventType, const EmscriptenMouseEven
     switch (eventType) {
     case EMSCRIPTEN_EVENT_MOUSEDOWN:
     {
-        if (window2) {
-            window2->raise();
-            if (!window2->isActive())
-                window2->requestActivate();
-        }
+        if (window2)
+            window2->requestActivate();
 
         pressedButtons.setFlag(button);
 
diff --git a/src/plugins/platforms/wasm/qwasmfontdatabase.cpp b/src/plugins/platforms/wasm/qwasmfontdatabase.cpp
index 0c72dfddc4..dc6bb5847e 100644
--- a/src/plugins/platforms/wasm/qwasmfontdatabase.cpp
+++ b/src/plugins/platforms/wasm/qwasmfontdatabase.cpp
@@ -38,9 +38,9 @@ void QWasmFontDatabase::populateFontDatabase()
     // Load font file from resources. Currently
     // all fonts needs to be bundled with the nexe
     // as Qt resources.
-    QStringList fontFileNames = QStringList() << QStringLiteral(":/fonts/Vera.ttf")
+    QStringList fontFileNames = QStringList() << QStringLiteral(":/fonts/DejaVuSansMono.ttf")
+                                              << QStringLiteral(":/fonts/Vera.ttf")
                                               << QStringLiteral(":/fonts/DejaVuSans.ttf");
-
     foreach (const QString &fontFileName, fontFileNames) {
         QFile theFont(fontFileName);
         if (!theFont.open(QIODevice::ReadOnly))
@@ -82,5 +82,9 @@ void QWasmFontDatabase::releaseHandle(void *handle)
     QFreeTypeFontDatabase::releaseHandle(handle);
 }
 
+QFont QWasmFontDatabase::defaultFont() const
+{
+    return QFont(QLatin1String("Bitstream Vera Sans"));
+}
 
 QT_END_NAMESPACE
diff --git a/src/plugins/platforms/wasm/qwasmfontdatabase.h b/src/plugins/platforms/wasm/qwasmfontdatabase.h
index 891f12859e..cbd187a022 100644
--- a/src/plugins/platforms/wasm/qwasmfontdatabase.h
+++ b/src/plugins/platforms/wasm/qwasmfontdatabase.h
@@ -44,6 +44,7 @@ public:
                                    QChar::Script script) const override;
     QStringList addApplicationFont(const QByteArray &fontData, const QString &fileName) override;
     void releaseHandle(void *handle) override;
+    QFont defaultFont() const override;
 };
 QT_END_NAMESPACE
 #endif
diff --git a/src/plugins/platforms/wasm/qwasmtheme.cpp b/src/plugins/platforms/wasm/qwasmtheme.cpp
index a7f2db3bd3..978d60d686 100644
--- a/src/plugins/platforms/wasm/qwasmtheme.cpp
+++ b/src/plugins/platforms/wasm/qwasmtheme.cpp
@@ -29,15 +29,22 @@
 
 #include "qwasmtheme.h"
 #include <QtCore/qvariant.h>
+#include <QFontDatabase>
 
 QT_BEGIN_NAMESPACE
 
 QWasmTheme::QWasmTheme()
 {
+    QFontDatabase fdb;
+    for (auto family : fdb.families())
+        if (fdb.isFixedPitch(family))
+            fixedFont = new QFont(family);
 }
 
 QWasmTheme::~QWasmTheme()
 {
+    if (fixedFont)
+        delete fixedFont;
 }
 
 QVariant QWasmTheme::themeHint(ThemeHint hint) const
@@ -47,4 +54,12 @@ QVariant QWasmTheme::themeHint(ThemeHint hint) const
     return QPlatformTheme::themeHint(hint);
 }
 
+const QFont *QWasmTheme::font(Font type) const
+{
+    if (type == QPlatformTheme::FixedFont) {
+        return fixedFont;
+    }
+    return nullptr;
+}
+
 QT_END_NAMESPACE
diff --git a/src/plugins/platforms/wasm/qwasmtheme.h b/src/plugins/platforms/wasm/qwasmtheme.h
index e4cc06e049..7123a1f3d4 100644
--- a/src/plugins/platforms/wasm/qwasmtheme.h
+++ b/src/plugins/platforms/wasm/qwasmtheme.h
@@ -31,6 +31,7 @@
 #define QWASMTHEME_H
 
 #include <qpa/qplatformtheme.h>
+#include <QtGui/QFont>
 
 QT_BEGIN_NAMESPACE
 
@@ -49,6 +50,8 @@ public:
     ~QWasmTheme();
 
     QVariant themeHint(ThemeHint hint) const override;
+    const QFont *font(Font type) const override;
+    QFont *fixedFont = nullptr;
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/platforms/wasm/wasm.pro b/src/plugins/platforms/wasm/wasm.pro
index 9b98445c68..e8728d9dba 100644
--- a/src/plugins/platforms/wasm/wasm.pro
+++ b/src/plugins/platforms/wasm/wasm.pro
@@ -39,7 +39,8 @@ HEADERS = \
 
 wasmfonts.files = \
     ../../../3rdparty/wasm/Vera.ttf \
-    ../../../3rdparty/wasm/DejaVuSans.ttf
+    ../../../3rdparty/wasm/DejaVuSans.ttf \
+    ../../../3rdparty/wasm/DejaVuSansMono.ttf
 wasmfonts.prefix = /fonts
 wasmfonts.base = ../../../3rdparty/wasm
 RESOURCES += wasmfonts