3 files changed, 65 insertions, 89 deletions
diff --git a/tests/benchmarks/corelib/tools/qstack/CMakeLists.txt b/tests/benchmarks/corelib/tools/qstack/CMakeLists.txt
index 4526af60db..e5ae510521 100644
--- a/tests/benchmarks/corelib/tools/qstack/CMakeLists.txt
+++ b/tests/benchmarks/corelib/tools/qstack/CMakeLists.txt
@@ -1,13 +1,14 @@
-# Generated from qstack.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
 
 #####################################################################
-## tst_bench_stack Binary:
+## tst_bench_qstack Binary:
 #####################################################################
 
-qt_internal_add_benchmark(tst_bench_stack
+qt_internal_add_benchmark(tst_bench_qstack
     SOURCES
-        main.cpp
-    PUBLIC_LIBRARIES
+        tst_bench_qstack.cpp
+    LIBRARIES
         Qt::CorePrivate
         Qt::Test
 )
diff --git a/tests/benchmarks/corelib/tools/qstack/main.cpp b/tests/benchmarks/corelib/tools/qstack/main.cpp
deleted file mode 100644
index c69e5c3ed8..0000000000
--- a/tests/benchmarks/corelib/tools/qstack/main.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 Robin Burchell <robin.burchell@viroteck.net>
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QStack>
-#include <QDebug>
-#include <QTest>
-
-#include <vector>
-
-class tst_QStack: public QObject
-{
-    Q_OBJECT
-
-private slots:
-    void qstack_push();
-    void qstack_pop();
-    void qstack_pushpopone();
-};
-
-const int N = 1000000;
-
-void tst_QStack::qstack_push()
-{
-    QStack<int> v;
-    QBENCHMARK {
-        for (int i = 0; i != N; ++i)
-            v.push(i);
-        v = QStack<int>();
-    }
-}
-
-void tst_QStack::qstack_pop()
-{
-    QStack<int> v;
-    for (int i = 0; i != N; ++i)
-        v.push(i);
-
-    QBENCHMARK {
-        QStack<int> v2 = v;
-        for (int i = 0; i != N; ++i) {
-            v2.pop();
-        }
-    }
-}
-
-void tst_QStack::qstack_pushpopone()
-{
-    QBENCHMARK {
-        QStack<int> v;
-        for (int i = 0; i != N; ++i) {
-            v.push(0);
-            v.pop();
-        }
-    }
-}
-
-QTEST_MAIN(tst_QStack)
-
-#include "main.moc"
diff --git a/tests/benchmarks/corelib/tools/qstack/tst_bench_qstack.cpp b/tests/benchmarks/corelib/tools/qstack/tst_bench_qstack.cpp
new file mode 100644
index 0000000000..e0c8cda18c
--- /dev/null
+++ b/tests/benchmarks/corelib/tools/qstack/tst_bench_qstack.cpp
@@ -0,0 +1,59 @@
+// Copyright (C) 2015 Robin Burchell <robin.burchell@viroteck.net>
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+
+#include <QStack>
+#include <QDebug>
+#include <QTest>
+
+#include <vector>
+
+class tst_QStack: public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void qstack_push();
+    void qstack_pop();
+    void qstack_pushpopone();
+};
+
+const int N = 1000000;
+
+void tst_QStack::qstack_push()
+{
+    QStack<int> v;
+    QBENCHMARK {
+        for (int i = 0; i != N; ++i)
+            v.push(i);
+        v = QStack<int>();
+    }
+}
+
+void tst_QStack::qstack_pop()
+{
+    QStack<int> v;
+    for (int i = 0; i != N; ++i)
+        v.push(i);
+
+    QBENCHMARK {
+        QStack<int> v2 = v;
+        for (int i = 0; i != N; ++i) {
+            v2.pop();
+        }
+    }
+}
+
+void tst_QStack::qstack_pushpopone()
+{
+    QBENCHMARK {
+        QStack<int> v;
+        for (int i = 0; i != N; ++i) {
+            v.push(0);
+            v.pop();
+        }
+    }
+}
+
+QTEST_MAIN(tst_QStack)
+
+#include "tst_bench_qstack.moc"