From 221a629722e5a5ab31bad9b4a90f168493b7722d Mon Sep 17 00:00:00 2001
From: chrchr-github <78114321+chrchr-github@users.noreply.github.com>
Date: Fri, 24 May 2024 16:23:49 +0200
Subject: [PATCH 1/5] Update qt.cfg

---
 cfg/qt.cfg | 58 ++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 37 insertions(+), 21 deletions(-)

diff --git a/cfg/qt.cfg b/cfg/qt.cfg
index 8d599ed5d3d..b1e8087fa5c 100644
--- a/cfg/qt.cfg
+++ b/cfg/qt.cfg
@@ -63,6 +63,7 @@
   <define name="SLOT(X)" value="#X"/>
   <!-- T qAbs(const T &t) -->
   <function name="qAbs">
+    <pure/>
     <noreturn>false</noreturn>
     <use-retval/>
     <arg nr="1" direction="in">
@@ -101,6 +102,7 @@
   <!-- quint32 qFloatDistance(float a, float b) -->
   <!-- quint64 qFloatDistance(double a, double b) -->
   <function name="qFloatDistance">
+    <pure/>
     <noreturn>false</noreturn>
     <use-retval/>
     <leak-ignore/>
@@ -132,6 +134,7 @@
   <!-- bool qFuzzyCompare(double p1, double p2) -->
   <!-- bool qFuzzyCompare(float p1, float p2) -->
   <function name="qFuzzyCompare">
+    <pure/>
     <noreturn>false</noreturn>
     <returnValue type="bool"/>
     <use-retval/>
@@ -147,6 +150,7 @@
   <!-- bool qFuzzyIsNull(double d) -->
   <!-- bool qFuzzyIsNull(float f) -->
   <function name="qFuzzyIsNull">
+    <pure/>
     <noreturn>false</noreturn>
     <returnValue type="bool"/>
     <use-retval/>
@@ -177,6 +181,7 @@
   <!-- bool	qIsFinite(double d) -->
   <!-- bool qIsFinite(float f) -->
   <function name="qIsFinite">
+    <pure/>
     <noreturn>false</noreturn>
     <returnValue type="bool"/>
     <use-retval/>
@@ -189,6 +194,7 @@
   <!-- bool qIsInf(double d) -->
   <!-- bool qIsInf(float f) -->
   <function name="qIsInf">
+    <pure/>
     <noreturn>false</noreturn>
     <returnValue type="bool"/>
     <use-retval/>
@@ -201,6 +207,7 @@
   <!-- bool qIsNaN(double d) -->
   <!-- bool qIsNaN(float f) -->
   <function name="qIsNaN">
+    <pure/>
     <noreturn>false</noreturn>
     <returnValue type="bool"/>
     <use-retval/>
@@ -267,6 +274,7 @@
   <!-- int qRound(double d) -->
   <!-- int qRound(float d) -->
   <function name="qRound">
+    <pure/>
     <noreturn>false</noreturn>
     <returnValue type="int"/>
     <use-retval/>
@@ -278,6 +286,7 @@
   <!-- qint64 qRound64(double d) -->
   <!-- qint64 qRound64(float d) -->
   <function name="qRound64">
+    <pure/>
     <noreturn>false</noreturn>
     <returnValue type="qint64"/>
     <use-retval/>
@@ -777,7 +786,14 @@
   <!-- void QList::append(const T &value) -->
   <!-- void QList::append(const QList<T> &value) -->
   <!-- QStringList inherits from QList -->
-  <function name="QList::append,QStringList::append">
+  <function name="QList::append">
+    <noreturn>false</noreturn>
+    <returnValue type="void"/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+  </function>
+  <function name="QStringList::append">
     <noreturn>false</noreturn>
     <returnValue type="void"/>
     <arg nr="1" direction="in">
@@ -1604,7 +1620,7 @@
   <function name="QList::prepend,QStringList::prepend">
     <noreturn>false</noreturn>
     <returnValue type="void"/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-uninit/>
     </arg>
   </function>
@@ -1628,7 +1644,7 @@
   <function name="QList::push_back,QStringList::push_back">
     <noreturn>false</noreturn>
     <returnValue type="void"/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-uninit/>
     </arg>
   </function>
@@ -1646,7 +1662,7 @@
   <function name="QList::push_front,QStringList::push_front">
     <noreturn>false</noreturn>
     <returnValue type="void"/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-uninit/>
     </arg>
   </function>
@@ -1709,7 +1725,7 @@
   <function name="QList::removeAll,QStringList::removeAll">
     <noreturn>false</noreturn>
     <returnValue type="int"/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-uninit/>
     </arg>
   </function>
@@ -2599,7 +2615,7 @@
   <function name="QBoxLayout::addWidget,QVBoxLayout::addWidget,QHBoxLayout::addWidget">
     <noreturn>false</noreturn>
     <returnValue type="void"/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-uninit/>
     </arg>
     <arg nr="2" default="0" direction="in">
@@ -4185,7 +4201,7 @@
     <noreturn>false</noreturn>
     <returnValue type="void"/>
     <leak-ignore/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-uninit/>
     </arg>
   </function>
@@ -4207,7 +4223,7 @@
     <use-retval/>
     <leak-ignore/>
     <const/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-uninit/>
     </arg>
   </function>
@@ -4229,14 +4245,14 @@
     <returnValue type="bool"/>
     <use-retval/>
     <const/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-uninit/>
     </arg>
   </function>
   <!-- QVector<T> &QVector::fill(const T &value, int size = ...) -->
   <function name="QVector::fill,QStack::fill">
     <noreturn>false</noreturn>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-uninit/>
     </arg>
     <arg nr="2" direction="in" default="-1">
@@ -4251,7 +4267,7 @@
     <use-retval/>
     <leak-ignore/>
     <const/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-uninit/>
     </arg>
     <arg nr="2" direction="in" default="">
@@ -4270,7 +4286,7 @@
     <arg nr="2" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="3" direction="in">
+    <arg nr="3">
       <not-uninit/>
     </arg>
   </function>
@@ -4281,7 +4297,7 @@
     <use-retval/>
     <leak-ignore/>
     <const/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-uninit/>
     </arg>
     <arg nr="2" direction="in" default="-1">
@@ -4295,7 +4311,7 @@
     <noreturn>false</noreturn>
     <returnValue type="void"/>
     <leak-ignore/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-uninit/>
     </arg>
   </function>
@@ -4317,7 +4333,7 @@
   <function name="QVector::removeAll,QStack::removeAll">
     <noreturn>false</noreturn>
     <returnValue type="int"/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-uninit/>
     </arg>
   </function>
@@ -4337,7 +4353,7 @@
       <not-uninit/>
       <valid>0:</valid>
     </arg>
-    <arg nr="2" direction="in">
+    <arg nr="2">
       <not-uninit/>
     </arg>
   </function>
@@ -4376,7 +4392,7 @@
     <use-retval/>
     <leak-ignore/>
     <const/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-uninit/>
     </arg>
   </function>
@@ -4437,7 +4453,7 @@
     <noreturn>false</noreturn>
     <returnValue type="void"/>
     <leak-ignore/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-uninit/>
     </arg>
   </function>
@@ -4448,7 +4464,7 @@
     <returnValue type="int"/>
     <use-retval/>
     <const/>
-    <arg nr="1" direction="in" default="">
+    <arg nr="1">
       <not-uninit/>
     </arg>
   </function>
@@ -4459,7 +4475,7 @@
     <use-retval/>
     <leak-ignore/>
     <const/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-uninit/>
     </arg>
   </function>
@@ -4488,7 +4504,7 @@
     <use-retval/>
     <leak-ignore/>
     <const/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-uninit/>
     </arg>
   </function>

From fdef3de8dfe089a5007e318d031485f5df8c9db2 Mon Sep 17 00:00:00 2001
From: chrchr-github <78114321+chrchr-github@users.noreply.github.com>
Date: Fri, 24 May 2024 16:24:22 +0200
Subject: [PATCH 2/5] Update qt.cpp

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

diff --git a/test/cfg/qt.cpp b/test/cfg/qt.cpp
index f77ea2e88ba..a78e5d67996 100644
--- a/test/cfg/qt.cpp
+++ b/test/cfg/qt.cpp
@@ -785,3 +785,8 @@ void unreadVariable_QMapIterator(QMap<QString, QObject*>& m)
         it.value() = new QObject();
     }
 }
+
+void constVariablePointer_QVector(QVector<int*>& qv, int* p)
+{
+    qv.push_back(p); // #12661
+}

From a2405dd4aa7a80da7c30dcc1e14621156c6e4321 Mon Sep 17 00:00:00 2001
From: chrchr-github <christian.riesch@live.com>
Date: Tue, 28 May 2024 23:50:37 +0200
Subject: [PATCH 3/5] indirect

---
 cfg/qt.cfg | 49 +++++++++++++++++++++----------------------------
 1 file changed, 21 insertions(+), 28 deletions(-)

diff --git a/cfg/qt.cfg b/cfg/qt.cfg
index b1e8087fa5c..2981898f63a 100644
--- a/cfg/qt.cfg
+++ b/cfg/qt.cfg
@@ -786,17 +786,10 @@
   <!-- void QList::append(const T &value) -->
   <!-- void QList::append(const QList<T> &value) -->
   <!-- QStringList inherits from QList -->
-  <function name="QList::append">
+  <function name="QList::append,QStringList::append">
     <noreturn>false</noreturn>
     <returnValue type="void"/>
-    <arg nr="1">
-      <not-uninit/>
-    </arg>
-  </function>
-  <function name="QStringList::append">
-    <noreturn>false</noreturn>
-    <returnValue type="void"/>
-    <arg nr="1" direction="in">
+    <arg nr="1" direction="in" indirect="0">
       <not-uninit/>
     </arg>
   </function>
@@ -1620,7 +1613,7 @@
   <function name="QList::prepend,QStringList::prepend">
     <noreturn>false</noreturn>
     <returnValue type="void"/>
-    <arg nr="1">
+    <arg nr="1" direction="in" indirect="0">
       <not-uninit/>
     </arg>
   </function>
@@ -1644,7 +1637,7 @@
   <function name="QList::push_back,QStringList::push_back">
     <noreturn>false</noreturn>
     <returnValue type="void"/>
-    <arg nr="1">
+    <arg nr="1" direction="in" indirect="0">
       <not-uninit/>
     </arg>
   </function>
@@ -1662,7 +1655,7 @@
   <function name="QList::push_front,QStringList::push_front">
     <noreturn>false</noreturn>
     <returnValue type="void"/>
-    <arg nr="1">
+    <arg nr="1" direction="in" indirect="0">
       <not-uninit/>
     </arg>
   </function>
@@ -1725,7 +1718,7 @@
   <function name="QList::removeAll,QStringList::removeAll">
     <noreturn>false</noreturn>
     <returnValue type="int"/>
-    <arg nr="1">
+    <arg nr="1" direction="in" indirect="0">
       <not-uninit/>
     </arg>
   </function>
@@ -2615,7 +2608,7 @@
   <function name="QBoxLayout::addWidget,QVBoxLayout::addWidget,QHBoxLayout::addWidget">
     <noreturn>false</noreturn>
     <returnValue type="void"/>
-    <arg nr="1">
+    <arg nr="1" direction="in" indirect="0">
       <not-uninit/>
     </arg>
     <arg nr="2" default="0" direction="in">
@@ -4201,7 +4194,7 @@
     <noreturn>false</noreturn>
     <returnValue type="void"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in" indirect="0">
       <not-uninit/>
     </arg>
   </function>
@@ -4223,7 +4216,7 @@
     <use-retval/>
     <leak-ignore/>
     <const/>
-    <arg nr="1">
+    <arg nr="1" direction="in" indirect="0">
       <not-uninit/>
     </arg>
   </function>
@@ -4252,7 +4245,7 @@
   <!-- QVector<T> &QVector::fill(const T &value, int size = ...) -->
   <function name="QVector::fill,QStack::fill">
     <noreturn>false</noreturn>
-    <arg nr="1">
+    <arg nr="1" direction="in" indirect="0">
       <not-uninit/>
     </arg>
     <arg nr="2" direction="in" default="-1">
@@ -4267,7 +4260,7 @@
     <use-retval/>
     <leak-ignore/>
     <const/>
-    <arg nr="1">
+    <arg nr="1" direction="in" indirect="0">
       <not-uninit/>
     </arg>
     <arg nr="2" direction="in" default="">
@@ -4280,7 +4273,7 @@
   <function name="QVector::insert,QStack::insert">
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in" indirect="0">
       <not-uninit/>
     </arg>
     <arg nr="2" direction="in">
@@ -4297,7 +4290,7 @@
     <use-retval/>
     <leak-ignore/>
     <const/>
-    <arg nr="1">
+    <arg nr="1" direction="in" indirect="0">
       <not-uninit/>
     </arg>
     <arg nr="2" direction="in" default="-1">
@@ -4311,7 +4304,7 @@
     <noreturn>false</noreturn>
     <returnValue type="void"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in" indirect="0">
       <not-uninit/>
     </arg>
   </function>
@@ -4333,7 +4326,7 @@
   <function name="QVector::removeAll,QStack::removeAll">
     <noreturn>false</noreturn>
     <returnValue type="int"/>
-    <arg nr="1">
+    <arg nr="1" direction="in" indirect="0">
       <not-uninit/>
     </arg>
   </function>
@@ -4353,7 +4346,7 @@
       <not-uninit/>
       <valid>0:</valid>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in" indirect="0">
       <not-uninit/>
     </arg>
   </function>
@@ -4392,7 +4385,7 @@
     <use-retval/>
     <leak-ignore/>
     <const/>
-    <arg nr="1">
+    <arg nr="1" direction="in" indirect="0">
       <not-uninit/>
     </arg>
   </function>
@@ -4453,7 +4446,7 @@
     <noreturn>false</noreturn>
     <returnValue type="void"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in" indirect="0">
       <not-uninit/>
     </arg>
   </function>
@@ -4464,7 +4457,7 @@
     <returnValue type="int"/>
     <use-retval/>
     <const/>
-    <arg nr="1">
+    <arg nr="1" direction="in" indirect="0">
       <not-uninit/>
     </arg>
   </function>
@@ -4475,7 +4468,7 @@
     <use-retval/>
     <leak-ignore/>
     <const/>
-    <arg nr="1">
+    <arg nr="1" direction="in" indirect="0">
       <not-uninit/>
     </arg>
   </function>
@@ -4504,7 +4497,7 @@
     <use-retval/>
     <leak-ignore/>
     <const/>
-    <arg nr="1">
+    <arg nr="1" direction="in" indirect="0">
       <not-uninit/>
     </arg>
   </function>

From a53484bc032c4748f77849f3f446b4fc4467e5f5 Mon Sep 17 00:00:00 2001
From: chrchr-github <christian.riesch@live.com>
Date: Sat, 8 Jun 2024 22:42:34 +0200
Subject: [PATCH 4/5] Fix

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

diff --git a/cfg/qt.cfg b/cfg/qt.cfg
index 0bee89186e1..a4099de491d 100644
--- a/cfg/qt.cfg
+++ b/cfg/qt.cfg
@@ -4238,7 +4238,7 @@
     <returnValue type="bool"/>
     <use-retval/>
     <const/>
-    <arg nr="1">
+    <arg nr="1"direction="in" indirect="0">
       <not-uninit/>
     </arg>
   </function>
@@ -4279,7 +4279,7 @@
     <arg nr="2" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in" indirect="0">
       <not-uninit/>
     </arg>
   </function>

From 9f1c638033647ee6004ff5cf2b0655043c539c39 Mon Sep 17 00:00:00 2001
From: chrchr-github <christian.riesch@live.com>
Date: Sat, 8 Jun 2024 22:48:07 +0200
Subject: [PATCH 5/5] Fix

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

diff --git a/cfg/qt.cfg b/cfg/qt.cfg
index a4099de491d..2ef1093c17f 100644
--- a/cfg/qt.cfg
+++ b/cfg/qt.cfg
@@ -4238,7 +4238,7 @@
     <returnValue type="bool"/>
     <use-retval/>
     <const/>
-    <arg nr="1"direction="in" indirect="0">
+    <arg nr="1" direction="in" indirect="0">
       <not-uninit/>
     </arg>
   </function>