From 96611a677fc0feeb374c191e248842167f39770d Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Thu, 10 Nov 2011 14:56:55 +0100 Subject: Fix parsing of #if defined expression MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We only need to match the closing parentheses if there was an opening one This has caused mis-parsing of tst_qbytearray.cpp Change-Id: I9d52916e3ed8549c5ddd968092451fef7389a952 Reviewed-by: João Abecasis --- tests/auto/tools/moc/tst_moc.cpp | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) (limited to 'tests/auto/tools') diff --git a/tests/auto/tools/moc/tst_moc.cpp b/tests/auto/tools/moc/tst_moc.cpp index aad095d490..6a84eb244a 100644 --- a/tests/auto/tools/moc/tst_moc.cpp +++ b/tests/auto/tools/moc/tst_moc.cpp @@ -346,11 +346,28 @@ private slots: void invalidSlot() {} #endif - friend class Receiver; // task #85783 signals: friend class Sender; // task #85783 +#define MACRO_DEFINED + +#if !(defined MACRO_UNDEF || defined MACRO_DEFINED) || 1 + void signalInIf1(); +#else + void doNotExist(); +#endif +#if !(!defined MACRO_UNDEF || !defined MACRO_DEFINED) && 1 + void doNotExist(); +#else + void signalInIf2(); +#endif +#if !(!defined (MACRO_DEFINED) || !defined (MACRO_UNDEF)) && 1 + void doNotExist(); +#else + void signalInIf3(); +#endif + public slots: void const slotWithSillyConst() {} @@ -756,6 +773,10 @@ void tst_Moc::preprocessorConditionals() QVERIFY(mobj->indexOfSlot("slotInIf()") != -1); QVERIFY(mobj->indexOfSlot("slotInLastElse()") != -1); QVERIFY(mobj->indexOfSlot("slotInElif()") != -1); + QVERIFY(mobj->indexOfSignal("signalInIf1()") != -1); + QVERIFY(mobj->indexOfSignal("signalInIf2()") != -1); + QVERIFY(mobj->indexOfSignal("signalInIf3()") != -1); + QVERIFY(mobj->indexOfSignal("doNotExist()") == -1); } void tst_Moc::blackslashNewlines() -- cgit v1.2.3