From b29f11108240f67c42b5fb34fb7f72cd0fadb56d Mon Sep 17 00:00:00 2001
From: chrchr-github <78114321+chrchr-github@users.noreply.github.com>
Date: Sat, 7 Jan 2023 23:29:47 +0100
Subject: [PATCH] Improve qt.cfg: unreadVariable for macro parameter (#4683)

---
 cfg/qt.cfg           | 9 +++++----
 test/cfg/qt.cpp      | 8 ++++++++
 test/cfg/runtests.sh | 6 +++---
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/cfg/qt.cfg b/cfg/qt.cfg
index 43feea299..2ff28550b 100644
--- a/cfg/qt.cfg
+++ b/cfg/qt.cfg
@@ -5179,15 +5179,15 @@
   <define name="QT_TRANSLATE_NOOP3_UTF8(scope, x, comment)" value="{x, comment}"/>
   <define name="QCOMPARE(actual, expected)" value="(void)((actual)==(expected))"/>
   <define name="QVERIFY(condition)" value="(void)(condition)"/>
-  <define name="QVERIFY2(condition, message)" value="(void)(condition)"/>
+  <define name="QVERIFY2(condition, message)" value="(void)(condition),(void)(message)"/>
   <define name="QBENCHMARK_ONCE" value=""/>
   <define name="QBENCHMARK" value=""/>
   <define name="QTRY_COMPARE(actual, expected)" value="(void)((actual)==(expected))"/>
   <define name="QTRY_COMPARE_WITH_TIMEOUT(actual, expected, timeout)" value="(void)((actual)==(expected))"/>
-  <define name="QTRY_VERIFY2(condition, message)" value="(void)(condition)"/>
+  <define name="QTRY_VERIFY2(condition, message)" value="(void)(condition),(void)(message)"/>
   <define name="QTRY_VERIFY(condition)" value="(void)(condition)"/>
-  <define name="QTRY_VERIFY2_WITH_TIMEOUT(condition, message, timeout)" value="(void)(condition)"/>
-  <define name="QTRY_VERIFY_WITH_TIMEOUT(condition, timeout)" value="(void)(condition)"/>
+  <define name="QTRY_VERIFY2_WITH_TIMEOUT(condition, message, timeout)" value="(void)(condition),(void)(message),(void)(timeout)"/>
+  <define name="QTRY_VERIFY_WITH_TIMEOUT(condition, timeout)" value="(void)(condition),(void)(timeout)"/>
   <define name="QTEST_GUILESS_MAIN(testclass)" value=""/>
   <define name="QTEST_APPLESS_MAIN(testclass)" value=""/>
   <define name="QTEST_MAIN(testclass)" value=""/>
@@ -5215,6 +5215,7 @@
   <define name="QT_FORWARD_DECLARE_STRUCT(name)" value="struct name;"/>
   <!-- https://doc.qt.io/qt-5/qstring.html#QStringLiteral -->
   <define name="QStringLiteral(str)" value="QString::fromUtf8(str, sizeof(str) - 1)"/>
+  <define name="QByteArrayLiteral(str)" value="QByteArray(str)"/>
   <!-- https://doc.qt.io/qt-5/qtglobal.html#qreal-typedef -->
   <define name="qreal" value="double"/>
   <podtype name="qint8" sign="s" size="1"/>
diff --git a/test/cfg/qt.cpp b/test/cfg/qt.cpp
index 3493dfe49..716fab94c 100644
--- a/test/cfg/qt.cpp
+++ b/test/cfg/qt.cpp
@@ -19,6 +19,7 @@
 #include <cstdio>
 #include <QCoreApplication>
 #include <QLoggingCategory>
+#include <QTest>
 
 
 void QString1(QString s)
@@ -412,6 +413,13 @@ void MacroTest2_test()
 #endif
 }
 
+void MacroTest3()
+{
+    QByteArray message = QByteArrayLiteral("Test1");
+    message += QByteArrayLiteral("Test2");
+    QVERIFY2(2 >= 0, message.constData());
+}
+
 void validCode(int * pIntPtr, QString & qstrArg)
 {
     if (QFile::exists("test")) {}
diff --git a/test/cfg/runtests.sh b/test/cfg/runtests.sh
index 8da6f5d58..3552cca99 100755
--- a/test/cfg/runtests.sh
+++ b/test/cfg/runtests.sh
@@ -33,7 +33,7 @@ CC_OPT='-Wno-format -Wno-stringop-overread -Wno-nonnull -Wno-implicit-function-d
 
 function get_pkg_config_cflags {
     set +e
-    PKGCONFIG=$(pkg-config --cflags $1)
+    PKGCONFIG=$(pkg-config --cflags "$@")
     PKGCONFIG_RETURNCODE=$?
     set -e
     if [ $PKGCONFIG_RETURNCODE -ne 0 ]; then
@@ -60,9 +60,9 @@ function gnu_fn {
 # qt.cpp
 function qt_fn {
     if [ $HAS_PKG_CONFIG -eq 1 ]; then
-        QTCONFIG=$(get_pkg_config_cflags Qt5Core)
+        QTCONFIG=$(get_pkg_config_cflags Qt5Core Qt5Test)
         if [ -n "$QTCONFIG" ]; then
-            QTBUILDCONFIG=$(pkg-config --variable=qt_config Qt5Core)
+            QTBUILDCONFIG=$(pkg-config --variable=qt_config Qt5Core Qt5Test)
             [[ $QTBUILDCONFIG =~ (^|[[:space:]])reduce_relocations($|[[:space:]]) ]] && QTCONFIG="${QTCONFIG} -fPIC"
             set +e
             echo -e "#include <QString>" | ${CXX} ${CXX_OPT} ${QTCONFIG} -x c++ -