summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJüri Valdmann <juri.valdmann@qt.io>2018-02-06 13:17:43 +0100
committerJüri Valdmann <juri.valdmann@qt.io>2018-02-13 08:18:16 +0000
commit99b084d04b9365d458d6225758224dfab26dea87 (patch)
treee4e899556dd886ed3f44d479d2b5a7db183d24ad
parent16832db4d2dc08adf971ed93d4e7393a597973bc (diff)
Fix undefined reference to qCompare error
Linking against qtbase 5.9 fails with error: undefined reference to 'bool QTest::qCompare<QString, char [13]>([...])' due to QCOMPARE of QString with C string literal. Change-Id: If4f4312d21d0b1a8ce2577d5f9d3a9ac0731b3a2 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
-rw-r--r--tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp2
-rw-r--r--tests/auto/widgets/qwebenginesettings/tst_qwebenginesettings.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
index f8f742ae1..b252fa763 100644
--- a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
+++ b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
@@ -905,7 +905,7 @@ void tst_QQuickWebEngineView::javascriptClipboard()
// make sure that 'OriginalText' is selected
evaluateJavaScriptSync(view, "document.getElementById('myInput').select()");
QCOMPARE(evaluateJavaScriptSync(view, "window.getSelection().toString()").toString(),
- "OriginalText");
+ QStringLiteral("OriginalText"));
// Check that the actual settings work by the
// - return value of queryCommandEnabled and
diff --git a/tests/auto/widgets/qwebenginesettings/tst_qwebenginesettings.cpp b/tests/auto/widgets/qwebenginesettings/tst_qwebenginesettings.cpp
index 9c008cb90..845520628 100644
--- a/tests/auto/widgets/qwebenginesettings/tst_qwebenginesettings.cpp
+++ b/tests/auto/widgets/qwebenginesettings/tst_qwebenginesettings.cpp
@@ -140,7 +140,7 @@ void tst_QWebEngineSettings::javascriptClipboard()
// make sure that 'OriginalText' is selected
evaluateJavaScriptSync(&page, "document.getElementById('myInput').select()");
QCOMPARE(evaluateJavaScriptSync(&page, "window.getSelection().toString()").toString(),
- "OriginalText");
+ QStringLiteral("OriginalText"));
// Check that the actual settings work by the
// - return value of queryCommandEnabled and