From 568c26227d09b48fa6066f74d9dfa5d844073a5c Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Wed, 24 Sep 2014 12:21:27 +0200 Subject: Silence moc warnings about 'argument mismatch' The moc preprocessor is not necessarily fully compatible with the native compiler preprocessor, which can lead to annoying warnings. This fixes a problem particularly with the boost headers that rely on MSVC only preprocessor features (to work around other MSVC preprocessor deficiencies). Task-number: QTBUG-29331 Change-Id: If884452969b512a746c81e235d31636b39c45b27 Reviewed-by: Olivier Goffart --- tests/auto/tools/moc/tst_moc.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/auto/tools/moc/tst_moc.cpp b/tests/auto/tools/moc/tst_moc.cpp index ec3dbd46a9..13e786cd20 100644 --- a/tests/auto/tools/moc/tst_moc.cpp +++ b/tests/auto/tools/moc/tst_moc.cpp @@ -1837,7 +1837,7 @@ void tst_Moc::warnings_data() << QStringList() << 0 << QString("IGNORE_ALL_STDOUT") - << QString(":3: Warning: Macro argument mismatch.\n:4: Warning: Macro argument mismatch."); + << QString(); QTest::newRow("Class declaration lacks Q_OBJECT macro.") << QByteArray("class X : public QObject \n { \n public slots: \n void foo() {} \n };") -- cgit v1.2.3