4 files changed, 9 insertions, 15 deletions
diff --git a/tests/manual/highdpi/kitchensink/CMakeLists.txt b/tests/manual/highdpi/kitchensink/CMakeLists.txt
index 50ce06fa04..e7558c19e0 100644
--- a/tests/manual/highdpi/kitchensink/CMakeLists.txt
+++ b/tests/manual/highdpi/kitchensink/CMakeLists.txt
@@ -1,7 +1,5 @@
-# Copyright (C) 2022 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-# Generated from kitchensink.pro.
+# Copyright (C) 2024 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
 
 #####################################################################
 ## kitchensink Binary:
@@ -37,7 +35,3 @@ qt_internal_add_resource(kitchensink "kitchensink"
     FILES
         ${kitchensink_resource_files}
 )
-
-
-#### Keys ignored in scope 1:.:.:kitchensink.pro:<TRUE>:
-# TEMPLATE = "app"
diff --git a/tests/manual/highdpi/kitchensink/dragwidget.cpp b/tests/manual/highdpi/kitchensink/dragwidget.cpp
index 22393f0416..4088a56a80 100644
--- a/tests/manual/highdpi/kitchensink/dragwidget.cpp
+++ b/tests/manual/highdpi/kitchensink/dragwidget.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 <QtWidgets>
 #include "dragwidget.h"
@@ -84,8 +84,8 @@ void DragWidget::dropEvent(QDropEvent *event)
 {
     if (event->mimeData()->hasText()) {
         const QMimeData *mime = event->mimeData();
-        QStringList pieces = mime->text().split(QRegularExpression("\\s+"),
-                             Qt::SkipEmptyParts);
+        const QStringList pieces = mime->text().split(QRegularExpression("\\s+"),
+                                                      Qt::SkipEmptyParts);
         QPoint position = event->pos();
         QPoint hotSpot;
 
@@ -98,7 +98,7 @@ void DragWidget::dropEvent(QDropEvent *event)
         dropTimer.start(500, this);
         update();
 
-        foreach (QString piece, pieces) {
+        for (const QString &piece : pieces) {
             FramedLabel *newLabel = new FramedLabel(piece, this);
             newLabel->move(position - hotSpot);
             newLabel->show();
diff --git a/tests/manual/highdpi/kitchensink/dragwidget.h b/tests/manual/highdpi/kitchensink/dragwidget.h
index e7b9ae1b6f..d444f7f0a6 100644
--- a/tests/manual/highdpi/kitchensink/dragwidget.h
+++ b/tests/manual/highdpi/kitchensink/dragwidget.h
@@ -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
 
 #ifndef DRAGWIDGET_H
 #define DRAGWIDGET_H
diff --git a/tests/manual/highdpi/kitchensink/main.cpp b/tests/manual/highdpi/kitchensink/main.cpp
index 861707e6b9..5fe46828bd 100644
--- a/tests/manual/highdpi/kitchensink/main.cpp
+++ b/tests/manual/highdpi/kitchensink/main.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 <QMainWindow>
 #include <QMenuBar>
@@ -1433,7 +1433,7 @@ int main(int argc, char **argv)
     demoList << new DemoContainer<GraphicsViewCaching>("graphicsview", "Test QGraphicsView caching");
     demoList << new DemoContainer<MetricsTest>("metrics", "Show screen metrics");
 
-    for (DemoContainerBase *demo : qAsConst(demoList))
+    for (DemoContainerBase *demo : std::as_const(demoList))
         parser.addOption(demo->option());
 
     parser.process(app);