From fbd3e9e7bc3b6f44b61f9459f288f681acd2985e Mon Sep 17 00:00:00 2001
From: chrchr <christian.riesch@live.com>
Date: Thu, 5 Jan 2023 11:27:27 +0100
Subject: [PATCH 01/15] Improve qt.cfg: unreadVariable for macro parameter

---
 cfg/qt.cfg      | 8 ++++----
 test/cfg/qt.cpp | 7 +++++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/cfg/qt.cfg b/cfg/qt.cfg
index 43feea299b4..217c9bf08cf 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=""/>
diff --git a/test/cfg/qt.cpp b/test/cfg/qt.cpp
index 3493dfe490b..a8af9041a66 100644
--- a/test/cfg/qt.cpp
+++ b/test/cfg/qt.cpp
@@ -412,6 +412,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")) {}

From 687d4e685e69813c731d37090ad035554b6e5961 Mon Sep 17 00:00:00 2001
From: chrchr <christian.riesch@live.com>
Date: Thu, 5 Jan 2023 12:07:08 +0100
Subject: [PATCH 02/15] Add QByteArrayLiteral()

---
 cfg/qt.cfg | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cfg/qt.cfg b/cfg/qt.cfg
index 217c9bf08cf..2ff28550b94 100644
--- a/cfg/qt.cfg
+++ b/cfg/qt.cfg
@@ -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"/>

From ed2ddb85fbd207280ae301993b9ea0e51a88f4ae Mon Sep 17 00:00:00 2001
From: chrchr <christian.riesch@live.com>
Date: Thu, 5 Jan 2023 12:30:28 +0100
Subject: [PATCH 03/15] Missing include

---
 test/cfg/qt.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/cfg/qt.cpp b/test/cfg/qt.cpp
index a8af9041a66..716fab94cf4 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)

From 7dabb520887ccfdf595c0f23297e5121bf623a42 Mon Sep 17 00:00:00 2001
From: chrchr <christian.riesch@live.com>
Date: Thu, 5 Jan 2023 13:12:01 +0100
Subject: [PATCH 04/15] Add  Qt5Test

---
 test/cfg/runtests.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/cfg/runtests.sh b/test/cfg/runtests.sh
index 8da6f5d58fd..6271ab08ac6 100755
--- a/test/cfg/runtests.sh
+++ b/test/cfg/runtests.sh
@@ -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++ -

From 5d6ada154040283a78b652f1d99c32fc6bf98c32 Mon Sep 17 00:00:00 2001
From: chrchr <christian.riesch@live.com>
Date: Thu, 5 Jan 2023 15:12:06 +0100
Subject: [PATCH 05/15] Revert "Add  Qt5Test"

This reverts commit 7dabb520887ccfdf595c0f23297e5121bf623a42.
---
 test/cfg/runtests.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/cfg/runtests.sh b/test/cfg/runtests.sh
index 6271ab08ac6..8da6f5d58fd 100755
--- a/test/cfg/runtests.sh
+++ b/test/cfg/runtests.sh
@@ -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 Qt5Test)
+        QTCONFIG=$(get_pkg_config_cflags Qt5Core)
         if [ -n "$QTCONFIG" ]; then
-            QTBUILDCONFIG=$(pkg-config --variable=qt_config Qt5Core Qt5Test)
+            QTBUILDCONFIG=$(pkg-config --variable=qt_config Qt5Core)
             [[ $QTBUILDCONFIG =~ (^|[[:space:]])reduce_relocations($|[[:space:]]) ]] && QTCONFIG="${QTCONFIG} -fPIC"
             set +e
             echo -e "#include <QString>" | ${CXX} ${CXX_OPT} ${QTCONFIG} -x c++ -

From 2ce2dfbb1e068e77294ff4047856fba5bd54de89 Mon Sep 17 00:00:00 2001
From: chrchr <christian.riesch@live.com>
Date: Thu, 5 Jan 2023 15:12:34 +0100
Subject: [PATCH 06/15] Install missing package

---
 .github/workflows/CI-unixish.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/CI-unixish.yml b/.github/workflows/CI-unixish.yml
index 7deee8e32ca..a203e61e397 100644
--- a/.github/workflows/CI-unixish.yml
+++ b/.github/workflows/CI-unixish.yml
@@ -326,7 +326,7 @@ jobs:
       - name: Install missing software on ubuntu 22.04 (cfg)
         if: matrix.os == 'ubuntu-22.04'
         run: |
-          sudo apt-get install libcairo2-dev libcurl4-openssl-dev liblua5.3-dev libssl-dev libsqlite3-dev libcppunit-dev libsigc++-2.0-dev libgtk-3-dev libboost-all-dev libwxgtk3.0-gtk3-dev xmlstarlet qtbase5-dev
+          sudo apt-get install libcairo2-dev libcurl4-openssl-dev liblua5.3-dev libssl-dev libsqlite3-dev libcppunit-dev libsigc++-2.0-dev libgtk-3-dev libboost-all-dev libwxgtk3.0-gtk3-dev xmlstarlet qtbase5-dev libqt5test5-dev
 
       # coreutils contains "nproc"
       - name: Install missing software on macos

From d85a33f99a5132eeb0fe3e3dcc01eeb7a91fac69 Mon Sep 17 00:00:00 2001
From: chrchr <christian.riesch@live.com>
Date: Thu, 5 Jan 2023 15:24:47 +0100
Subject: [PATCH 07/15] Fix package name

---
 .github/workflows/CI-unixish.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/CI-unixish.yml b/.github/workflows/CI-unixish.yml
index a203e61e397..69731950d6f 100644
--- a/.github/workflows/CI-unixish.yml
+++ b/.github/workflows/CI-unixish.yml
@@ -326,7 +326,7 @@ jobs:
       - name: Install missing software on ubuntu 22.04 (cfg)
         if: matrix.os == 'ubuntu-22.04'
         run: |
-          sudo apt-get install libcairo2-dev libcurl4-openssl-dev liblua5.3-dev libssl-dev libsqlite3-dev libcppunit-dev libsigc++-2.0-dev libgtk-3-dev libboost-all-dev libwxgtk3.0-gtk3-dev xmlstarlet qtbase5-dev libqt5test5-dev
+          sudo apt-get install libcairo2-dev libcurl4-openssl-dev liblua5.3-dev libssl-dev libsqlite3-dev libcppunit-dev libsigc++-2.0-dev libgtk-3-dev libboost-all-dev libwxgtk3.0-gtk3-dev xmlstarlet qtbase5-dev libqt5test5
 
       # coreutils contains "nproc"
       - name: Install missing software on macos

From 3866a0e062fd7a7ea038686049c24ab5f71c82d5 Mon Sep 17 00:00:00 2001
From: chrchr <christian.riesch@live.com>
Date: Thu, 5 Jan 2023 15:47:34 +0100
Subject: [PATCH 08/15] Revert "Fix package name"

This reverts commit d85a33f99a5132eeb0fe3e3dcc01eeb7a91fac69.
---
 .github/workflows/CI-unixish.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/CI-unixish.yml b/.github/workflows/CI-unixish.yml
index 69731950d6f..a203e61e397 100644
--- a/.github/workflows/CI-unixish.yml
+++ b/.github/workflows/CI-unixish.yml
@@ -326,7 +326,7 @@ jobs:
       - name: Install missing software on ubuntu 22.04 (cfg)
         if: matrix.os == 'ubuntu-22.04'
         run: |
-          sudo apt-get install libcairo2-dev libcurl4-openssl-dev liblua5.3-dev libssl-dev libsqlite3-dev libcppunit-dev libsigc++-2.0-dev libgtk-3-dev libboost-all-dev libwxgtk3.0-gtk3-dev xmlstarlet qtbase5-dev libqt5test5
+          sudo apt-get install libcairo2-dev libcurl4-openssl-dev liblua5.3-dev libssl-dev libsqlite3-dev libcppunit-dev libsigc++-2.0-dev libgtk-3-dev libboost-all-dev libwxgtk3.0-gtk3-dev xmlstarlet qtbase5-dev libqt5test5-dev
 
       # coreutils contains "nproc"
       - name: Install missing software on macos

From e71958a623d4b9c16f3c39ce0b88e09b2e86fa91 Mon Sep 17 00:00:00 2001
From: chrchr <christian.riesch@live.com>
Date: Thu, 5 Jan 2023 15:47:47 +0100
Subject: [PATCH 09/15] Revert "Install missing package"

This reverts commit 2ce2dfbb1e068e77294ff4047856fba5bd54de89.
---
 .github/workflows/CI-unixish.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/CI-unixish.yml b/.github/workflows/CI-unixish.yml
index a203e61e397..7deee8e32ca 100644
--- a/.github/workflows/CI-unixish.yml
+++ b/.github/workflows/CI-unixish.yml
@@ -326,7 +326,7 @@ jobs:
       - name: Install missing software on ubuntu 22.04 (cfg)
         if: matrix.os == 'ubuntu-22.04'
         run: |
-          sudo apt-get install libcairo2-dev libcurl4-openssl-dev liblua5.3-dev libssl-dev libsqlite3-dev libcppunit-dev libsigc++-2.0-dev libgtk-3-dev libboost-all-dev libwxgtk3.0-gtk3-dev xmlstarlet qtbase5-dev libqt5test5-dev
+          sudo apt-get install libcairo2-dev libcurl4-openssl-dev liblua5.3-dev libssl-dev libsqlite3-dev libcppunit-dev libsigc++-2.0-dev libgtk-3-dev libboost-all-dev libwxgtk3.0-gtk3-dev xmlstarlet qtbase5-dev
 
       # coreutils contains "nproc"
       - name: Install missing software on macos

From cef07838c86a0e268ade8d6477acbddbea77b0e2 Mon Sep 17 00:00:00 2001
From: chrchr <christian.riesch@live.com>
Date: Thu, 5 Jan 2023 15:48:19 +0100
Subject: [PATCH 10/15] Try different include

---
 test/cfg/qt.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/cfg/qt.cpp b/test/cfg/qt.cpp
index 716fab94cf4..3cf71faa71f 100644
--- a/test/cfg/qt.cpp
+++ b/test/cfg/qt.cpp
@@ -19,7 +19,7 @@
 #include <cstdio>
 #include <QCoreApplication>
 #include <QLoggingCategory>
-#include <QTest>
+#include <QtTest>
 
 
 void QString1(QString s)

From 9e8d4c2e8fabe2e6ea122f372cbc5189d98ce34f Mon Sep 17 00:00:00 2001
From: chrchr <christian.riesch@live.com>
Date: Thu, 5 Jan 2023 16:18:15 +0100
Subject: [PATCH 11/15] Revert "Revert "Add  Qt5Test""

This reverts commit 5d6ada154040283a78b652f1d99c32fc6bf98c32.
---
 test/cfg/runtests.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/cfg/runtests.sh b/test/cfg/runtests.sh
index 8da6f5d58fd..6271ab08ac6 100755
--- a/test/cfg/runtests.sh
+++ b/test/cfg/runtests.sh
@@ -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++ -

From b6c82e766d08a78632a816a7791bdf132429f8b0 Mon Sep 17 00:00:00 2001
From: chrchr <christian.riesch@live.com>
Date: Thu, 5 Jan 2023 19:06:04 +0100
Subject: [PATCH 12/15] Revert "Try different include"

This reverts commit cef07838c86a0e268ade8d6477acbddbea77b0e2.
---
 test/cfg/qt.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/cfg/qt.cpp b/test/cfg/qt.cpp
index 3cf71faa71f..716fab94cf4 100644
--- a/test/cfg/qt.cpp
+++ b/test/cfg/qt.cpp
@@ -19,7 +19,7 @@
 #include <cstdio>
 #include <QCoreApplication>
 #include <QLoggingCategory>
-#include <QtTest>
+#include <QTest>
 
 
 void QString1(QString s)

From 2ba43df8d4cedaa3a6a82b1bbf1c203b4d5cef49 Mon Sep 17 00:00:00 2001
From: chrchr <christian.riesch@live.com>
Date: Thu, 5 Jan 2023 19:30:53 +0100
Subject: [PATCH 13/15] Change placeholder

---
 test/cfg/runtests.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/cfg/runtests.sh b/test/cfg/runtests.sh
index 6271ab08ac6..03d93285dcb 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

From 243d490915d40eb67569c8961b5c47b5b3caaa40 Mon Sep 17 00:00:00 2001
From: chrchr <christian.riesch@live.com>
Date: Thu, 5 Jan 2023 19:54:03 +0100
Subject: [PATCH 14/15] Add quotes

---
 test/cfg/runtests.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/cfg/runtests.sh b/test/cfg/runtests.sh
index 03d93285dcb..5ab7eae69cf 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 $*)
+    PKGCONFIG=$(pkg-config --cflags "$*")
     PKGCONFIG_RETURNCODE=$?
     set -e
     if [ $PKGCONFIG_RETURNCODE -ne 0 ]; then

From 860d481c78b45817da6949fdea4d893b7262ab0e Mon Sep 17 00:00:00 2001
From: chrchr <christian.riesch@live.com>
Date: Thu, 5 Jan 2023 20:20:05 +0100
Subject: [PATCH 15/15] Use @

---
 test/cfg/runtests.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/cfg/runtests.sh b/test/cfg/runtests.sh
index 5ab7eae69cf..3552cca99b7 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 "$*")
+    PKGCONFIG=$(pkg-config --cflags "$@")
     PKGCONFIG_RETURNCODE=$?
     set -e
     if [ $PKGCONFIG_RETURNCODE -ne 0 ]; then