From 6e38ddff775e8c0747d2afaebdc38b4414caa217 Mon Sep 17 00:00:00 2001
From: Daschle Newberry <dnewberry@deltamotion.com>
Date: Fri, 14 Aug 2026 16:25:22 -0700
Subject: [PATCH 1/2] Fixed Qt config macro declaration

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

diff --git a/cfg/qt.cfg b/cfg/qt.cfg
index c7bf3d8779b..95dc022cf57 100644
--- a/cfg/qt.cfg
+++ b/cfg/qt.cfg
@@ -5520,7 +5520,7 @@
   <define name="Q_OVERRIDE(x)" value=""/>
   <define name="Q_PLUGIN_METADATA(x)" value=""/>
   <define name="Q_ASSERT(condition)" value="assert(condition)"/>
-  <define name="Q_ASSERT_X(condition, where, what)" value="assert(condition)"/>
+  <define name="Q_ASSERT_X(condition, where, what)" value="assert(condition); (void)(where); (void)(what)"/>
   <define name="QTC_ASSERT_STRINGIFY_HELPER(x)" value="#x"/>
   <define name="QTC_ASSERT_STRINGIFY(x)" value="QTC_ASSERT_STRINGIFY_HELPER(x)"/>
   <define name="QTC_ASSERT_STRING(cond)" value="::Utils::writeAssertLocation( &quot;\&quot;&quot; cond&quot;\&quot; in file &quot; __FILE__ &quot;, line &quot; QTC_ASSERT_STRINGIFY(__LINE__))"/>

From 7de9278368ad7b57d5fa469048faaf4812fdeb4b Mon Sep 17 00:00:00 2001
From: chrchr-github <78114321+chrchr-github@users.noreply.github.com>
Date: Wed, 26 Aug 2026 10:28:05 +0200
Subject: [PATCH 2/2] Add test in qt.cpp

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

diff --git a/test/cfg/qt.cpp b/test/cfg/qt.cpp
index 2b683648dcd..34f6cc8c957 100644
--- a/test/cfg/qt.cpp
+++ b/test/cfg/qt.cpp
@@ -894,6 +894,13 @@ int qdateIsValid()
     return qd.month(); 
 }
 
+void qAssertX()
+{
+    const char *where = "test";
+    const char *what = "assertion failed";
+    Q_ASSERT_X(false, where, what);
+}
+
 struct S_QTimer_connect : QObject { // #13846
     S_QTimer_connect() {
         // cppcheck-suppress checkLibraryFunction - timeout() is a signal from QTimer