Skip to content

Commit cf280f8

Browse files
qt: fix Q_UNUSED macro defintion (#4925)
1 parent 5ec0ad6 commit cf280f8

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

cfg/qt.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5170,7 +5170,7 @@
51705170
<define name="Q_Q(Class)" value="Class * const q = q_func()"/>
51715171
<define name="Q_RETURN_ARG(type, data)" value="QReturnArgument&lt;type &gt;(#type, data)"/>
51725172
<define name="Q_UNLIKELY(expr)" value="expr"/>
5173-
<define name="Q_UNUSED(X)" value="(void)(X)"/>
5173+
<define name="Q_UNUSED(X)" value="(void)(X);"/>
51745174
<define name="QT_BEGIN_NAMESPACE" value=""/>
51755175
<define name="QT_END_NAMESPACE" value=""/>
51765176
<define name="QT_TR_NOOP(x)" value="x"/>

test/cfg/qt.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,8 +420,9 @@ void MacroTest3()
420420
QVERIFY2(2 >= 0, message.constData());
421421
}
422422

423-
void validCode(int * pIntPtr, QString & qstrArg)
423+
void validCode(int * pIntPtr, QString & qstrArg, double d)
424424
{
425+
Q_UNUSED(d)
425426
if (QFile::exists("test")) {}
426427

427428
if (pIntPtr != Q_NULLPTR) {

0 commit comments

Comments
 (0)