Skip to content

Commit ca3f092

Browse files
authored
Fix Q_DISABLE_COPY macros (danmar#7509)
7 months ago, C was partially expanded to Class, but was forgotten in two instances.
1 parent cb6083f commit ca3f092

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

cfg/qt.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5347,8 +5347,8 @@
53475347
<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;"/>
53485348
<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;"/>
53495349
<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:"/>
5350-
<define name="Q_DISABLE_COPY(Class)" value="Class(C&amp;);Class&amp; operator=(const Class&amp;);"/>
5351-
<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;);"/>
5350+
<define name="Q_DISABLE_COPY(Class)" value="Class(Class&amp;);Class&amp; operator=(const Class&amp;);"/>
5351+
<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;);"/>
53525352
<define name="Q_EMIT" value=""/>
53535353
<define name="Q_ENUM(X)" value=""/>
53545354
<define name="Q_ENUMS(X)" value=""/>

0 commit comments

Comments
 (0)