summaryrefslogtreecommitdiffstats
path: root/tests/auto/tools
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@digia.com>2014-09-24 12:21:27 +0200
committerKai Koehne <kai.koehne@digia.com>2014-09-25 15:42:40 +0200
commit568c26227d09b48fa6066f74d9dfa5d844073a5c (patch)
tree0c45bb013de9b940df86c2e35047a7d8590bbbf8 /tests/auto/tools
parentee31bc59bec8b63e681f7fda0e67819458994880 (diff)
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 <ogoffart@woboq.com>
Diffstat (limited to 'tests/auto/tools')
-rw-r--r--tests/auto/tools/moc/tst_moc.cpp2
1 files changed, 1 insertions, 1 deletions
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 };")