From 52552f0d121169e099f0f01128b66863829b8453 Mon Sep 17 00:00:00 2001
From: Sune Vuorela <sune@vuorela.dk>
Date: Mon, 5 May 2025 17:36:23 +0200
Subject: [PATCH 1/2] Fix Q_DISABLE_COPY macros

7 months ago, C was partially expanded to Class, but was forgotten in two instances.
---
 cfg/qt.cfg | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cfg/qt.cfg b/cfg/qt.cfg
index 4b79e1b73bf..3874d768d26 100644
--- a/cfg/qt.cfg
+++ b/cfg/qt.cfg
@@ -2,7 +2,7 @@
 <def format="2">
   <markup ext=".qml" reporterrors="false" aftercode="true">
     <!-- keywords in QML code to ignore -->
-    <keywords>
+    <keywords>/
       <keyword name="if"/>
       <keyword name="while"/>
       <keyword name="typeof"/>
@@ -5345,8 +5345,8 @@
   <define name="Q_DECLARE_PRIVATE_D(Dptr, Class)" value="inline Class##Private* d_func() { return reinterpret_cast&lt;Class##Private *&gt;(qGetPtrHelper(Dptr)); } inline const Class##Private* d_func() const { return reinterpret_cast&lt;const Class##Private *&gt;(qGetPtrHelper(Dptr)); } friend class Class##Private;"/>
   <define name="Q_DECLARE_PUBLIC(Class)" value="inline Class##Public* d_func() { return reinterpret_cast&lt;Class##Public*&gt;(qGetPtrHelper(d_ptr)); } inline const Class##Public d_func() const { return reinterpret_cast&lt;const Class##Public *&gt;(qGetPtrHelper(d_ptr)); } friend class Class##Public;"/>
   <define name="Q_DECLARE_TR_FUNCTIONS(context)" value="public: static inline QString tr(const char *sourceText, const char *disambiguation = Q_NULLPTR, int n = -1) { return QCoreApplication::translate(#context, sourceText, disambiguation, n); } QT_DECLARE_DEPRECATED_TR_FUNCTIONS(context) private:"/>
-  <define name="Q_DISABLE_COPY(Class)" value="Class(C&amp;);Class&amp; operator=(const Class&amp;);"/>
-  <define name="Q_DISABLE_COPY_MOVE(Class)" value="Class(C&amp;);Class&amp; operator=(const Class&amp;);Class(C&amp;&amp;);Class&amp; operator=(Class&amp;&amp;);"/>
+  <define name="Q_DISABLE_COPY(Class)" value="Class(Class&amp;);Class&amp; operator=(const Class&amp;);"/>
+  <define name="Q_DISABLE_COPY_MOVE(Class)" value="Class(Class&amp;);Class&amp; operator=(const Class&amp;);Class(C&amp;&amp;);Class&amp; operator=(Class&amp;&amp;);"/>
   <define name="Q_EMIT" value=""/>
   <define name="Q_ENUM(X)" value=""/>
   <define name="Q_ENUMS(X)" value=""/>

From 75cbd1a7120123dff5deefb741a0e4012b9a734b Mon Sep 17 00:00:00 2001
From: Sune Vuorela <sune@vuorela.dk>
Date: Tue, 6 May 2025 08:12:33 +0200
Subject: [PATCH 2/2] Update qt.cfg

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

diff --git a/cfg/qt.cfg b/cfg/qt.cfg
index 3874d768d26..754c787b0a8 100644
--- a/cfg/qt.cfg
+++ b/cfg/qt.cfg
@@ -2,7 +2,7 @@
 <def format="2">
   <markup ext=".qml" reporterrors="false" aftercode="true">
     <!-- keywords in QML code to ignore -->
-    <keywords>/
+    <keywords>
       <keyword name="if"/>
       <keyword name="while"/>
       <keyword name="typeof"/>