Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"

4 files changed, 6 insertions, 5 deletions

diff --git a/src/plugins/platforms/ios/qiostextinputoverlay.mm b/src/plugins/platforms/ios/qiostextinputoverlay.mm
index 0561a826c6..3da4ba5480 100644
--- a/src/plugins/platforms/ios/qiostextinputoverlay.mm
+++ b/src/plugins/platforms/ios/qiostextinputoverlay.mm
@@ -511,7 +511,7 @@ static void executeBlockWithoutAnimation(Block block)
 
 - (void)createLoupe
 {
-    // We magnify the the desktop view. But the loupe itself will be added as a child
+    // We magnify the desktop view. But the loupe itself will be added as a child
     // of the desktop view's parent, so it doesn't become a part of what we magnify.
     _loupeLayer = [[self createLoupeLayer] retain];
     _loupeLayer.targetView = _desktopView;
diff --git a/src/plugins/platforms/ios/qiosviewcontroller.mm b/src/plugins/platforms/ios/qiosviewcontroller.mm
index ce2aa96ca5..cd4af46ef7 100644
--- a/src/plugins/platforms/ios/qiosviewcontroller.mm
+++ b/src/plugins/platforms/ios/qiosviewcontroller.mm
@@ -452,7 +452,7 @@
     if (!focusWindow->screen() || focusWindow->screen()->handle() != self.platformScreen)
         return;
 
-    // All decisions are based on the the top level window
+    // All decisions are based on the top level window
     focusWindow = qt_window_private(focusWindow)->topLevelWindow();
 
 #ifndef Q_OS_TVOS
diff --git a/src/plugins/platforms/wasm/qwasmintegration.cpp b/src/plugins/platforms/wasm/qwasmintegration.cpp
index fd53cd0bae..ee3f6afb73 100644
--- a/src/plugins/platforms/wasm/qwasmintegration.cpp
+++ b/src/plugins/platforms/wasm/qwasmintegration.cpp
@@ -133,7 +133,7 @@ QWasmIntegration::QWasmIntegration()
         Q_UNUSED(userData);
 
         // This resize event is called when the HTML window is resized. Depending
-        // on the page layout the the canvas(es) might also have been resized, so we
+        // on the page layout the canvas(es) might also have been resized, so we
         // update the Qt screen sizes (and canvas render sizes).
         if (QWasmIntegration *integration = QWasmIntegration::get())
             integration->resizeAllScreens();
diff --git a/src/plugins/platforms/wasm/qwasmstring.cpp b/src/plugins/platforms/wasm/qwasmstring.cpp
index 05b571c459..b1be405eeb 100644
--- a/src/plugins/platforms/wasm/qwasmstring.cpp
+++ b/src/plugins/platforms/wasm/qwasmstring.cpp
@@ -52,9 +52,10 @@ QString QWasmString::toQString(const val &v)
         val::global("Module")["stringToUTF16"]);
     static const val length("length");
 
-    result.resize(v[length].as<int>());
+    int len = v[length].as<int>();
+    result.resize(len);
     auto ptr = quintptr(result.utf16());
-    stringToUTF16(v, val(ptr));
+    stringToUTF16(v, val(ptr), val((len + 1) * 2));
     return result;
 }