Put JavaScript commands for WebActions in QStringLiteral

QWebEnginePage::runJavaScript and QQuickWebEngineView::runJavaScript
have QString parameters. Passing raw strings causes them to be passed
to the deprecated QString constructor, which causes warnings in the
compilation.

Change-Id: I072149ca85c94b2b94c7b5d9aa198eddd47460e8
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

2 files changed, 24 insertions, 24 deletions

diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index 8077e2c0b..45f65e49b 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -1710,40 +1710,40 @@ void QQuickWebEngineView::triggerWebAction(WebAction action)
         d->adapter->viewSource();
         break;
     case ToggleBold:
-        runJavaScript("document.execCommand('bold');", QQuickWebEngineScript::ApplicationWorld);
+        runJavaScript(QStringLiteral("document.execCommand('bold');"), QQuickWebEngineScript::ApplicationWorld);
         break;
     case ToggleItalic:
-        runJavaScript("document.execCommand('italic');", QQuickWebEngineScript::ApplicationWorld);
+        runJavaScript(QStringLiteral("document.execCommand('italic');"), QQuickWebEngineScript::ApplicationWorld);
         break;
     case ToggleUnderline:
-        runJavaScript("document.execCommand('underline');", QQuickWebEngineScript::ApplicationWorld);
+        runJavaScript(QStringLiteral("document.execCommand('underline');"), QQuickWebEngineScript::ApplicationWorld);
         break;
     case ToggleStrikethrough:
-        runJavaScript("document.execCommand('strikethrough');", QQuickWebEngineScript::ApplicationWorld);
+        runJavaScript(QStringLiteral("document.execCommand('strikethrough');"), QQuickWebEngineScript::ApplicationWorld);
         break;
     case AlignLeft:
-        runJavaScript("document.execCommand('justifyLeft');", QQuickWebEngineScript::ApplicationWorld);
+        runJavaScript(QStringLiteral("document.execCommand('justifyLeft');"), QQuickWebEngineScript::ApplicationWorld);
         break;
     case AlignCenter:
-        runJavaScript("document.execCommand('justifyCenter');", QQuickWebEngineScript::ApplicationWorld);
+        runJavaScript(QStringLiteral("document.execCommand('justifyCenter');"), QQuickWebEngineScript::ApplicationWorld);
         break;
     case AlignRight:
-        runJavaScript("document.execCommand('justifyRight');", QQuickWebEngineScript::ApplicationWorld);
+        runJavaScript(QStringLiteral("document.execCommand('justifyRight');"), QQuickWebEngineScript::ApplicationWorld);
         break;
     case AlignJustified:
-        runJavaScript("document.execCommand('justifyFull');", QQuickWebEngineScript::ApplicationWorld);
+        runJavaScript(QStringLiteral("document.execCommand('justifyFull');"), QQuickWebEngineScript::ApplicationWorld);
         break;
     case Indent:
-        runJavaScript("document.execCommand('indent');", QQuickWebEngineScript::ApplicationWorld);
+        runJavaScript(QStringLiteral("document.execCommand('indent');"), QQuickWebEngineScript::ApplicationWorld);
         break;
     case Outdent:
-        runJavaScript("document.execCommand('outdent');", QQuickWebEngineScript::ApplicationWorld);
+        runJavaScript(QStringLiteral("document.execCommand('outdent');"), QQuickWebEngineScript::ApplicationWorld);
         break;
     case InsertOrderedList:
-        runJavaScript("document.execCommand('insertOrderedList');", QQuickWebEngineScript::ApplicationWorld);
+        runJavaScript(QStringLiteral("document.execCommand('insertOrderedList');"), QQuickWebEngineScript::ApplicationWorld);
         break;
     case InsertUnorderedList:
-        runJavaScript("document.execCommand('insertUnorderedList');", QQuickWebEngineScript::ApplicationWorld);
+        runJavaScript(QStringLiteral("document.execCommand('insertUnorderedList');"), QQuickWebEngineScript::ApplicationWorld);
         break;
     default:
         Q_UNREACHABLE();
diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
index 691a3f238..724418ee2 100644
--- a/src/webenginewidgets/api/qwebenginepage.cpp
+++ b/src/webenginewidgets/api/qwebenginepage.cpp
@@ -1371,40 +1371,40 @@ void QWebEnginePage::triggerAction(WebAction action, bool)
         QTimer::singleShot(0, this, [d](){ d->adapter->viewSource(); });
         break;
     case ToggleBold:
-        runJavaScript("document.execCommand('bold');", QWebEngineScript::ApplicationWorld);
+        runJavaScript(QStringLiteral("document.execCommand('bold');"), QWebEngineScript::ApplicationWorld);
         break;
     case ToggleItalic:
-        runJavaScript("document.execCommand('italic');", QWebEngineScript::ApplicationWorld);
+        runJavaScript(QStringLiteral("document.execCommand('italic');"), QWebEngineScript::ApplicationWorld);
         break;
     case ToggleUnderline:
-        runJavaScript("document.execCommand('underline');", QWebEngineScript::ApplicationWorld);
+        runJavaScript(QStringLiteral("document.execCommand('underline');"), QWebEngineScript::ApplicationWorld);
         break;
     case ToggleStrikethrough:
-        runJavaScript("document.execCommand('strikethrough');", QWebEngineScript::ApplicationWorld);
+        runJavaScript(QStringLiteral("document.execCommand('strikethrough');"), QWebEngineScript::ApplicationWorld);
         break;
     case AlignLeft:
-        runJavaScript("document.execCommand('justifyLeft');", QWebEngineScript::ApplicationWorld);
+        runJavaScript(QStringLiteral("document.execCommand('justifyLeft');"), QWebEngineScript::ApplicationWorld);
         break;
     case AlignCenter:
-        runJavaScript("document.execCommand('justifyCenter');", QWebEngineScript::ApplicationWorld);
+        runJavaScript(QStringLiteral("document.execCommand('justifyCenter');"), QWebEngineScript::ApplicationWorld);
         break;
     case AlignRight:
-        runJavaScript("document.execCommand('justifyRight');", QWebEngineScript::ApplicationWorld);
+        runJavaScript(QStringLiteral("document.execCommand('justifyRight');"), QWebEngineScript::ApplicationWorld);
         break;
     case AlignJustified:
-        runJavaScript("document.execCommand('justifyFull');", QWebEngineScript::ApplicationWorld);
+        runJavaScript(QStringLiteral("document.execCommand('justifyFull');"), QWebEngineScript::ApplicationWorld);
         break;
     case Indent:
-        runJavaScript("document.execCommand('indent');", QWebEngineScript::ApplicationWorld);
+        runJavaScript(QStringLiteral("document.execCommand('indent');"), QWebEngineScript::ApplicationWorld);
         break;
     case Outdent:
-        runJavaScript("document.execCommand('outdent');", QWebEngineScript::ApplicationWorld);
+        runJavaScript(QStringLiteral("document.execCommand('outdent');"), QWebEngineScript::ApplicationWorld);
         break;
     case InsertOrderedList:
-        runJavaScript("document.execCommand('insertOrderedList');", QWebEngineScript::ApplicationWorld);
+        runJavaScript(QStringLiteral("document.execCommand('insertOrderedList');"), QWebEngineScript::ApplicationWorld);
         break;
     case InsertUnorderedList:
-        runJavaScript("document.execCommand('insertUnorderedList');", QWebEngineScript::ApplicationWorld);
+        runJavaScript(QStringLiteral("document.execCommand('insertUnorderedList');"), QWebEngineScript::ApplicationWorld);
         break;
     case NoWebAction:
         break;