diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-05-20 19:31:18 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-05-20 19:31:19 +0200 |
| commit | 36c025a8d66b244b6017746b415881ef1814b1e2 (patch) | |
| tree | 419c55a80f161e3882a3060cbcf0762d7a151841 /tests/auto/corelib/tools/qmap/tst_qmap.cpp | |
| parent | d55f2b1fb9c910bc118f75967a0e6273f8aa98d1 (diff) | |
| parent | 8e8bd90e4445415df7b7f516444e594d3e678c1a (diff) | |
Merge 5.7 into 5.7.0
Change-Id: I416c79d9afde98efc9e78b3a74e17dfbb2409602
Diffstat (limited to 'tests/auto/corelib/tools/qmap/tst_qmap.cpp')
| -rw-r--r-- | tests/auto/corelib/tools/qmap/tst_qmap.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/corelib/tools/qmap/tst_qmap.cpp b/tests/auto/corelib/tools/qmap/tst_qmap.cpp index 0898c10ea6..8aa7a3e518 100644 --- a/tests/auto/corelib/tools/qmap/tst_qmap.cpp +++ b/tests/auto/corelib/tools/qmap/tst_qmap.cpp @@ -1007,7 +1007,7 @@ void tst_QMap::qmultimap_specific() void tst_QMap::const_shared_null() { QMap<int, QString> map2; -#if QT_SUPPORTS(UNSHARABLE_CONTAINERS) +#if !defined(QT_NO_UNSHARABLE_CONTAINERS) QMap<int, QString> map1; map1.setSharable(false); QVERIFY(map1.isDetached()); @@ -1104,7 +1104,7 @@ const T &const_(const T &t) void tst_QMap::setSharable() { -#if QT_SUPPORTS(UNSHARABLE_CONTAINERS) +#if !defined(QT_NO_UNSHARABLE_CONTAINERS) QMap<int, QString> map; map.insert(1, "um"); |