From 1757054ff7d7288280a1198ac3b30ce077db084f Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Mon, 26 Jun 2023 10:51:16 +0200 Subject: [PATCH] tst_QV4UrlObject: fix -Wtrigraph The token sequence ??= used to be a trigraph for # until C++17 removed the concept. Clang warns about their use, though, so escape the two trigraphs in the test suite by splitting them with a pair of "". Amends 6cca731f3e1304ce98f1ec18af42e3bd06001eea. Change-Id: I455883c4ad92541941fc8fed62277c97c24170db Reviewed-by: Ulf Hermann (cherry picked from commit 15721065e8854b185007e482c9692a659678383e) Reviewed-by: Qt Cherry-pick Bot --- tests/auto/qml/qv4urlobject/tst_qv4urlobject.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/auto/qml/qv4urlobject/tst_qv4urlobject.cpp b/tests/auto/qml/qv4urlobject/tst_qv4urlobject.cpp index b74ec3d583..7017b01e37 100644 --- a/tests/auto/qml/qv4urlobject/tst_qv4urlobject.cpp +++ b/tests/auto/qml/qv4urlobject/tst_qv4urlobject.cpp @@ -89,9 +89,10 @@ void tst_urlobject::urlObject_search_data() "url.search" << ""; QTest::newRow("Question mark") - << "var url = new URL(\"http://www.google.com/search??=?\");" + // the embedded ""'s break trigraph sequences: + << "var url = new URL(\"http://www.google.com/search?""?=?\");" "url.search" - << "??=?"; + << "?""?=?"; QTest::newRow("equal sign") << "var url = new URL(\"http://www.google.com/search?a==&b=!\");" "url.search"