diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-19 10:03:48 +0100 |
|---|---|---|
| committer | Kent Hansen <kent.hansen@nokia.com> | 2012-03-19 10:03:48 +0100 |
| commit | 95d6f8a4cf3fba2fd675f0e6b5de0ce1d702da26 (patch) | |
| tree | a0bb36e478c97761afa36baf8026726b3d2fdbc8 /tests/auto/corelib/tools | |
| parent | 3f64a7b67bfbcaab65ebb03f84962cce5834790b (diff) | |
| parent | 25e004bfe493e18be255b057ae5c132a5ec5458b (diff) | |
Merge master into api_changes
Conflicts:
src/corelib/tools/qvector.h
tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
Change-Id: I877256e95f3788e617437f4e9661a88047f38cd6
Diffstat (limited to 'tests/auto/corelib/tools')
| -rw-r--r-- | tests/auto/corelib/tools/qmap/tst_qmap.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/corelib/tools/qset/tst_qset.cpp | 24 |
2 files changed, 14 insertions, 12 deletions
diff --git a/tests/auto/corelib/tools/qmap/tst_qmap.cpp b/tests/auto/corelib/tools/qmap/tst_qmap.cpp index 79b0a931cb..7d0ef7d7e4 100644 --- a/tests/auto/corelib/tools/qmap/tst_qmap.cpp +++ b/tests/auto/corelib/tools/qmap/tst_qmap.cpp @@ -285,6 +285,8 @@ void tst_QMap::beginEnd() QVERIFY( map.constBegin() == map.constEnd() ); map.insert( "0", "a" ); map.insert( "1", "b" ); + QVERIFY( map.constBegin() == map.cbegin() ); + QVERIFY( map.constEnd() == map.cend() ); // make a copy. const function shouldn't detach StringMap map2 = map; diff --git a/tests/auto/corelib/tools/qset/tst_qset.cpp b/tests/auto/corelib/tools/qset/tst_qset.cpp index d7d8c99071..ee83339d50 100644 --- a/tests/auto/corelib/tools/qset/tst_qset.cpp +++ b/tests/auto/corelib/tools/qset/tst_qset.cpp @@ -393,9 +393,9 @@ void tst_QSet::begin() { QSet<int>::const_iterator i = set1.constBegin(); - QSet<int>::const_iterator j = set1.constBegin(); + QSet<int>::const_iterator j = set1.cbegin(); QSet<int>::const_iterator k = set2.constBegin(); - QSet<int>::const_iterator ell = set2.constBegin(); + QSet<int>::const_iterator ell = set2.cbegin(); QVERIFY(i == j); QVERIFY(k == ell); @@ -407,9 +407,9 @@ void tst_QSet::begin() { QSet<int>::const_iterator i = set1.constBegin(); - QSet<int>::const_iterator j = set1.constBegin(); + QSet<int>::const_iterator j = set1.cbegin(); QSet<int>::const_iterator k = set2.constBegin(); - QSet<int>::const_iterator ell = set2.constBegin(); + QSet<int>::const_iterator ell = set2.cbegin(); QVERIFY(i == j); QVERIFY(k == ell); @@ -421,9 +421,9 @@ void tst_QSet::begin() { QSet<int>::const_iterator i = set1.constBegin(); - QSet<int>::const_iterator j = set1.constBegin(); + QSet<int>::const_iterator j = set1.cbegin(); QSet<int>::const_iterator k = set2.constBegin(); - QSet<int>::const_iterator ell = set2.constBegin(); + QSet<int>::const_iterator ell = set2.cbegin(); QVERIFY(i == j); QVERIFY(k == ell); @@ -439,9 +439,9 @@ void tst_QSet::end() { QSet<int>::const_iterator i = set1.constEnd(); - QSet<int>::const_iterator j = set1.constEnd(); + QSet<int>::const_iterator j = set1.cend(); QSet<int>::const_iterator k = set2.constEnd(); - QSet<int>::const_iterator ell = set2.constEnd(); + QSet<int>::const_iterator ell = set2.cend(); QVERIFY(i == j); QVERIFY(k == ell); @@ -456,9 +456,9 @@ void tst_QSet::end() { QSet<int>::const_iterator i = set1.constEnd(); - QSet<int>::const_iterator j = set1.constEnd(); + QSet<int>::const_iterator j = set1.cend(); QSet<int>::const_iterator k = set2.constEnd(); - QSet<int>::const_iterator ell = set2.constEnd(); + QSet<int>::const_iterator ell = set2.cend(); QVERIFY(i == j); QVERIFY(k == ell); @@ -473,9 +473,9 @@ void tst_QSet::end() { QSet<int>::const_iterator i = set1.constEnd(); - QSet<int>::const_iterator j = set1.constEnd(); + QSet<int>::const_iterator j = set1.cend(); QSet<int>::const_iterator k = set2.constEnd(); - QSet<int>::const_iterator ell = set2.constEnd(); + QSet<int>::const_iterator ell = set2.cend(); QVERIFY(i == j); QVERIFY(k == ell); |