diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-07-20 12:37:35 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-07-20 12:44:02 (GMT) |
| commit | 5cfad3a7b24abbde6c01bba0fbf8446b3a5137f7 (patch) | |
| tree | b231b1f9b78d82f1deb75600ba89bdd9c364563c /tests/auto | |
| parent | 3552343a19a0f1a694c2e61b81e63ecf758978cc (diff) | |
| download | Qt-5cfad3a7b24abbde6c01bba0fbf8446b3a5137f7.zip Qt-5cfad3a7b24abbde6c01bba0fbf8446b3a5137f7.tar.gz Qt-5cfad3a7b24abbde6c01bba0fbf8446b3a5137f7.tar.bz2 | |
Workaround gcc bug, disable test with old version of gcc
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/moc/tst_moc.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/moc/tst_moc.cpp b/tests/auto/moc/tst_moc.cpp index 4fcc7bd..d871540 100644 --- a/tests/auto/moc/tst_moc.cpp +++ b/tests/auto/moc/tst_moc.cpp @@ -1344,14 +1344,18 @@ signals: class QTBUG12260_defaultTemplate_Object : public QObject { Q_OBJECT public slots: +#if !(defined(Q_CC_GNU) && __GNUC__ == 4 && __GNUC_MINOR__ <= 3) //gcc bug, this does not compile void doSomething(QHash<QString, QVariant> values = QHash<QString, QVariant>()) { Q_UNUSED(values); } +#endif void doAnotherThing(bool a = (1 < 3), bool b = (1 > 4)) { Q_UNUSED(a); Q_UNUSED(b); } }; void tst_Moc::QTBUG12260_defaultTemplate() { +#if !(defined(Q_CC_GNU) && __GNUC__ == 4 && __GNUC_MINOR__ <= 3) QVERIFY(QTBUG12260_defaultTemplate_Object::staticMetaObject.indexOfSlot("doSomething(QHash<QString,QVariant>)") != -1); +#endif QVERIFY(QTBUG12260_defaultTemplate_Object::staticMetaObject.indexOfSlot("doAnotherThing(bool,bool)") != -1); } |