Merge remote-tracking branch 'origin/5.15' into dev

 Conflicts:
	src/corelib/tools/qvector.h
		Make QVector(DataPointer dd) public to be able to properly merge
		5b4b437b30b320e2cd7c9a566999a39772e5d431 from 5.15 into dev.
	src/widgets/kernel/qapplication.cpp
	tests/auto/tools/moc/allmocs_baseline_in.json

Done-With: Christian Ehrlicher <ch.ehrlicher@gmx.de>
Change-Id: I929ba7c036d570382d0454c2c75f6f0d96ddbc01

1 files changed, 15 insertions, 0 deletions

diff --git a/tests/benchmarks/corelib/tools/qmap/main.cpp b/tests/benchmarks/corelib/tools/qmap/main.cpp
index ce415212e4..50cc853df6 100644
--- a/tests/benchmarks/corelib/tools/qmap/main.cpp
+++ b/tests/benchmarks/corelib/tools/qmap/main.cpp
@@ -59,6 +59,8 @@ private slots:
 
     void insertion_string_int2();
     void insertion_string_int2_hint();
+
+    void insertMap();
 };
 
 
@@ -269,6 +271,19 @@ void tst_QMap::insertion_string_int2_hint()
     }
 }
 
+void tst_QMap::insertMap()
+{
+    QMap<int, int> map;
+    for (int i = 0; i < 100000; ++i)
+        map.insert(i * 4, 0);
+    QMap<int, int> map2;
+    for (int i = 0; i < 50000; ++i)
+        map2.insert(i * 7, 0);
+    QBENCHMARK_ONCE {
+        map.insert(map2);
+    }
+}
+
 QTEST_MAIN(tst_QMap)
 
 #include "main.moc"