summaryrefslogtreecommitdiffstats
path: root/src/webengine/api/qquickwebengineview.cpp
diff options
context:
space:
mode:
authorViktor Engelmann <viktor.engelmann@qt.io>2017-04-28 09:04:11 +0200
committerViktor Engelmann <viktor.engelmann@qt.io>2017-04-28 08:26:06 +0000
commitada52a979840c39e883838095068c0da42019587 (patch)
treecfe75a0dfc6cd63e68cff593997412807c48fa0d /src/webengine/api/qquickwebengineview.cpp
parentbb063988d42634cf7de547d193f7e273519c441d (diff)
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>
Diffstat (limited to 'src/webengine/api/qquickwebengineview.cpp')
-rw-r--r--src/webengine/api/qquickwebengineview.cpp24
1 files changed, 12 insertions, 12 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();