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

 Conflicts:
	examples/widgets/graphicsview/boxes/scene.h
	src/corelib/Qt5CoreMacros.cmake
	src/corelib/Qt6CoreMacros.cmake
	src/network/ssl/qsslsocket.cpp
	src/network/ssl/qsslsocket.h
	src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp
	src/testlib/CMakeLists.txt
	src/testlib/.prev_CMakeLists.txt
	tests/auto/corelib/tools/qscopeguard/tst_qscopeguard.cpp

Disabled building manual tests with CMake for now, because qmake
doesn't do it, and it confuses people.

Done-With: Alexandru Croitor <alexandru.croitor@qt.io>
Done-With: Volker Hilsheimer <volker.hilsheimer@qt.io>
Change-Id: I865ae347bd01f4e59f16d007b66d175a52f1f152

1 files changed, 12 insertions, 11 deletions

diff --git a/tests/auto/testlib/selftests/benchliboptions/tst_benchliboptions.cpp b/tests/auto/testlib/selftests/benchliboptions/tst_benchliboptions.cpp
index c1acf5a6e8..b89ca28ff2 100644
--- a/tests/auto/testlib/selftests/benchliboptions/tst_benchliboptions.cpp
+++ b/tests/auto/testlib/selftests/benchliboptions/tst_benchliboptions.cpp
@@ -83,6 +83,9 @@ void tst_BenchlibOptions::threeEvents()
 
 int main(int argc, char** argv)
 {
+    std::vector<const char*> args(argv, argv + argc);
+    args.push_back("-eventcounter");
+
     int ret = 0;
 
     TestEventDispatcher dispatcher;
@@ -91,29 +94,27 @@ int main(int argc, char** argv)
     /* Run with no special arguments. */
     {
         tst_BenchlibOptions test;
-        ret += QTest::qExec(&test, argc, argv);
+        ret += QTest::qExec(&test, args.size(), const_cast<char**>(&args[0]));
     }
 
     /* Run with an exact number of iterations. */
     {
-        QVector<char const*> args;
-        for (int i = 0; i < argc; ++i) args << argv[i];
-        args << "-iterations";
-        args << "15";
+        auto extraArgs = args;
+        extraArgs.push_back("-iterations");
+        extraArgs.push_back("15");
         tst_BenchlibFifteenIterations test;
-        ret += QTest::qExec(&test, args.count(), const_cast<char**>(args.data()));
+        ret += QTest::qExec(&test, extraArgs.size(), const_cast<char**>(&extraArgs[0]));
     }
 
     /*
         Run until getting a value of at least 100.
     */
     {
-        QVector<char const*> args;
-        for (int i = 0; i < argc; ++i) args << argv[i];
-        args << "-minimumvalue";
-        args << "100";
+        auto extraArgs = args;
+        extraArgs.push_back("-minimumvalue");
+        extraArgs.push_back("100");
         tst_BenchlibOneHundredMinimum test;
-        ret += QTest::qExec(&test, args.count(), const_cast<char**>(args.data()));
+        ret += QTest::qExec(&test, extraArgs.size(), const_cast<char**>(&extraArgs[0]));
     }
 
     return ret;