1 files changed, 28 insertions, 27 deletions
diff --git a/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp b/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp
index 667c6868b7..071e6d4cbc 100644
--- a/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp
+++ b/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 
 #include <QTest>
@@ -908,55 +908,56 @@ void tst_QSplitter::rubberBandNotInSplitter()
 
 void tst_QSplitter::task187373_addAbstractScrollAreas_data()
 {
-    QTest::addColumn<QString>("className");
+    QTest::addColumn<QByteArray>("className");
     QTest::addColumn<bool>("addInConstructor");
     QTest::addColumn<bool>("addOutsideConstructor");
 
-    QStringList classNames;
-    classNames << QLatin1String("QGraphicsView");
-    classNames << QLatin1String("QMdiArea");
-    classNames << QLatin1String("QScrollArea");
-    classNames << QLatin1String("QTextEdit");
-    classNames << QLatin1String("QTreeView");
-
-    foreach (QString className, classNames) {
-        QTest::newRow(qPrintable(className + QLatin1String(" 1"))) << className << false << true;
-        QTest::newRow(qPrintable(className + QLatin1String(" 2"))) << className << true << false;
-        QTest::newRow(qPrintable(className + QLatin1String(" 3"))) << className << true << true;
+    QList<QByteArray> classNames{
+        "QGraphicsView",
+        "QMdiArea",
+        "QScrollArea",
+        "QTextEdit",
+        "QTreeView"
+    };
+
+    for (const auto &className : std::as_const(classNames)) {
+        QTest::newRow(qPrintable(className + " 1")) << className << false << true;
+        QTest::newRow(qPrintable(className + " 2")) << className << true << false;
+        QTest::newRow(qPrintable(className + " 3")) << className << true << true;
     }
 }
 
 static QAbstractScrollArea *task187373_createScrollArea(
-    QSplitter *splitter, const QString &className, bool addInConstructor)
+    QSplitter *splitter, const QByteArray &className, bool addInConstructor)
 {
-    if (className == QLatin1String("QGraphicsView"))
+    if (className == "QGraphicsView")
         return new QGraphicsView(addInConstructor ? splitter : 0);
-    if (className == QLatin1String("QMdiArea"))
+    if (className == "QMdiArea")
         return new QMdiArea(addInConstructor ? splitter : 0);
-    if (className == QLatin1String("QScrollArea"))
+    if (className == "QScrollArea")
         return new QScrollArea(addInConstructor ? splitter : 0);
-    if (className == QLatin1String("QTextEdit"))
+    if (className == "QTextEdit")
         return new QTextEdit(addInConstructor ? splitter : 0);
-    if (className == QLatin1String("QTreeView"))
+    if (className == "QTreeView")
         return new QTreeView(addInConstructor ? splitter : 0);
     return 0;
 }
 
 void tst_QSplitter::task187373_addAbstractScrollAreas()
 {
-    QFETCH(QString, className);
+    QFETCH(QByteArray, className);
     QFETCH(bool, addInConstructor);
     QFETCH(bool, addOutsideConstructor);
     QVERIFY(addInConstructor || addOutsideConstructor);
 
-    QSplitter *splitter = new QSplitter;
-    splitter->show();
-    QVERIFY(splitter->isVisible());
+    QSplitter splitter;
+    splitter.show();
+    QVERIFY(splitter.isVisible());
 
-    QAbstractScrollArea *w = task187373_createScrollArea(splitter, className, addInConstructor);
+    QAbstractScrollArea *w = task187373_createScrollArea(&splitter, className, addInConstructor);
     QVERIFY(w);
     if (addOutsideConstructor)
-        splitter->addWidget(w);
+        splitter.addWidget(w);
 
     QTRY_VERIFY(w->isVisible());
     QVERIFY(!w->isHidden());
@@ -1031,7 +1032,7 @@ void tst_QSplitter::taskQTBUG_4101_ensureOneNonCollapsedWidget()
     QFETCH(bool, testingHide);
 
     MyFriendlySplitter s;
-    QLabel *l;
+    QLabel *l = nullptr;
     for (int i = 0; i < 5; ++i) {
         l = new QLabel(QString("Label ") + QChar('A' + i));
         l->setAlignment(Qt::AlignCenter);
@@ -1062,7 +1063,7 @@ void tst_QSplitter::taskQTBUG_102249_moveNonPressed()
                    Qt::NoButton, Qt::MouseButtons(Qt::LeftButton),
                    Qt::NoModifier);
     qApp->sendEvent(s.handle(0), &me);
-    QCOMPARE(spyMove.count(), 0);
+    QCOMPARE(spyMove.size(), 0);
 }
 
 void tst_QSplitter::setLayout()