From 99b084d04b9365d458d6225758224dfab26dea87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCri=20Valdmann?= <juri.valdmann@qt.io>
Date: Tue, 6 Feb 2018 13:17:43 +0100
Subject: [PATCH] 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>
---
.../auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp | 2 +-
.../auto/widgets/qwebenginesettings/tst_qwebenginesettings.cpp | 2 +-
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
--
GitLab