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

 Conflicts:
	src/corelib/global/qfloat16.cpp
	src/corelib/global/qfloat16.h
	src/plugins/platforms/windows/qwindowswindow.cpp

Change-Id: I0938aaa6a9771f55e48c95ed29f6f5291431b947

1 files changed, 14 insertions, 0 deletions

diff --git a/src/plugins/platforms/wasm/qtloader.js b/src/plugins/platforms/wasm/qtloader.js
index 4752a1dcee..ef4a6ec2b9 100644
--- a/src/plugins/platforms/wasm/qtloader.js
+++ b/src/plugins/platforms/wasm/qtloader.js
@@ -124,6 +124,8 @@
 //      Remove canvas at run-time. Removes the corresponding QScreen.
 // resizeCanvasElement
 //      Signals to the application that a canvas has been resized.
+// setFontDpi
+//      Sets the logical font dpi for the application.
 
 
 var Module = {}
@@ -237,6 +239,8 @@ function QtLoader(config)
     publicAPI.addCanvasElement = addCanvasElement;
     publicAPI.removeCanvasElement = removeCanvasElement;
     publicAPI.resizeCanvasElement = resizeCanvasElement;
+    publicAPI.setFontDpi = setFontDpi;
+    publicAPI.fontDpi = fontDpi;
 
     restartCount = 0;
 
@@ -557,6 +561,16 @@ function QtLoader(config)
             Module.qtResizeCanvasElement(element);
     }
 
+    function setFontDpi(dpi) {
+        Module.qtFontDpi = dpi;
+        if (publicAPI.status == "Running")
+            Module.qtSetFontDpi(dpi);
+    }
+
+    function fontDpi() {
+        return Module.qtFontDpi;
+    }
+
     setStatus("Created");
 
     return publicAPI;