diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-22 12:30:20 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-22 12:30:20 (GMT) |
| commit | d52e4462652c925a293a22c2880392e0458735bc (patch) | |
| tree | 0832a08361dd610a6aa6299b289b3251919b4799 /tests/auto | |
| parent | 0d446ec758aacd131f2da0fa67a081fd93cff898 (diff) | |
| parent | ffd6720bacb5f1a9146384debf0cb82377650c43 (diff) | |
| download | Qt-d52e4462652c925a293a22c2880392e0458735bc.zip Qt-d52e4462652c925a293a22c2880392e0458735bc.tar.gz Qt-d52e4462652c925a293a22c2880392e0458735bc.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix C++0x initializer lists tests.
Keep other text format with QTextOption::SuppressColors tag on
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/qlist/tst_qlist.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/qvector/tst_qvector.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qlist/tst_qlist.cpp b/tests/auto/qlist/tst_qlist.cpp index 9f6b4a5..14b8057 100644 --- a/tests/auto/qlist/tst_qlist.cpp +++ b/tests/auto/qlist/tst_qlist.cpp @@ -666,7 +666,7 @@ void tst_QList::testSTLIterators() const void tst_QList::initializeList() const { -#ifdef QT_CXX0X_INITIALIZERLIST +#ifdef Q_COMPILER_INITIALIZER_LISTS QList<int> v1{2,3,4}; QCOMPARE(v1, QList<int>() << 2 << 3 << 4); QCOMPARE(v1, (QList<int>{2,3,4})); diff --git a/tests/auto/qvector/tst_qvector.cpp b/tests/auto/qvector/tst_qvector.cpp index d8dfacf..a04ce60 100644 --- a/tests/auto/qvector/tst_qvector.cpp +++ b/tests/auto/qvector/tst_qvector.cpp @@ -837,7 +837,7 @@ void tst_QVector::QTBUG6416_reserve() void tst_QVector::initializeList() { -#ifdef QT_CXX0X_INITIALIZERLIST +#ifdef Q_COMPILER_INITIALIZER_LISTS QVector<int> v1{2,3,4}; QCOMPARE(v1, QVector<int>() << 2 << 3 << 4); QCOMPARE(v1, (QVector<int>{2,3,4})); |