diff options
author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2010-09-27 11:41:38 +0200 |
---|---|---|
committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2010-09-27 11:41:38 +0200 |
commit | 2271315eb46665b0a9e61ff0525340713163c1b6 (patch) | |
tree | d0068e34924eca85eb6af4089b3f443a89c929f6 /tests/auto/qvector/tst_qvector.cpp | |
parent | 33e7ee9d1866f12a9b92fe4b5549c31e30974d8e (diff) | |
parent | 53d010a989aed878c21522cbaf0d75c7cf821b42 (diff) |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt
Conflicts:
configure
src/corelib/global/qglobal.h
Diffstat (limited to 'tests/auto/qvector/tst_qvector.cpp')
-rw-r--r-- | tests/auto/qvector/tst_qvector.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qvector/tst_qvector.cpp b/tests/auto/qvector/tst_qvector.cpp index d8dfacfeaf..a04ce604b4 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})); |