diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-05-24 16:24:19 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-01 12:27:32 +0200 |
| commit | 9c5a77f0ef0b2ace0b11719142115eded4a7c05e (patch) | |
| tree | 8fcc4e48e4b5b2c7a8cf0ea95054034538abed08 /tests/auto | |
| parent | b60f6447d0efc622792113bc4896c0dc176e8df3 (diff) | |
Make QVector compile with QT_STRICT_ITERATORS again
Move the iterator classes into QArrayTypedData and add constBegin()
and constEnd() to that class.
I also had to add an operator T*() to the strict iterators, since
there are many places that expect the iterator to behave like a
pointer (including in QVector itself).
Change-Id: Icc5ed56ad47b013664a48eef9d31b5273aecb4e3
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/other/collections/collections.pro | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/auto/other/collections/collections.pro b/tests/auto/other/collections/collections.pro index 364ae21858..292c4e794d 100644 --- a/tests/auto/other/collections/collections.pro +++ b/tests/auto/other/collections/collections.pro @@ -3,3 +3,6 @@ TARGET = tst_collections SOURCES += tst_collections.cpp QT = core testlib CONFIG += parallel_test + +# This test does not work with strict iterators +DEFINES -= QT_STRICT_ITERATORS |