13 files changed, 16 insertions, 29 deletions
diff --git a/tests/manual/highdpi/CMakeLists.txt b/tests/manual/highdpi/CMakeLists.txt
index 7fd28828f1..f4b6dc70e8 100644
--- a/tests/manual/highdpi/CMakeLists.txt
+++ b/tests/manual/highdpi/CMakeLists.txt
@@ -1,16 +1,10 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-# Generated from highdpi.pro.
-
-#####################################################################
-## qmlimageproviderplugin Generic Library:
-#####################################################################
-
-qt_internal_add_cmake_library(qmlimageproviderplugin
+qt_internal_add_cmake_library(qmlhighdpiimageproviderplugin
     MODULE
-    INSTALL_DIRECTORY "${INSTALL_EXAMPLESDIR}/quick/imageprovider/ImageProvider"
-    OUTPUT_DIRECTORY "ImageProvider"
+    INSTALL_DIRECTORY "${INSTALL_EXAMPLESDIR}/quick/imageprovider/HighDPIImageProvider"
+    OUTPUT_DIRECTORY "HighDPIImageProvider"
     SOURCES
         imageprovider.cpp
     LIBRARIES
@@ -20,11 +14,4 @@ qt_internal_add_cmake_library(qmlimageproviderplugin
         Qt::Quick
 )
 
-#### Keys ignored in scope 1:.:.:highdpi.pro:<TRUE>:
-# INSTALLS = "target" "qml"
-# TEMPLATE = "lib"
-# qml.files = "ImageProvider/qmldir"
-# qml.path = "$$[QT_INSTALL_EXAMPLES]/quick/imageprovider/ImageProvider"
-# target.path = "$$[QT_INSTALL_EXAMPLES]/quick/imageprovider/ImageProvider"
-
-qt_autogen_tools_initial_setup(qmlimageproviderplugin)
+qt_autogen_tools_initial_setup(qmlhighdpiimageproviderplugin)
diff --git a/tests/manual/highdpi/HighDPIImageProvider/qmldir b/tests/manual/highdpi/HighDPIImageProvider/qmldir
new file mode 100644
index 0000000000..a65519510e
--- /dev/null
+++ b/tests/manual/highdpi/HighDPIImageProvider/qmldir
@@ -0,0 +1 @@
+plugin qmlhighdpiimageproviderplugin
diff --git a/tests/manual/highdpi/ImageProvider/qmldir b/tests/manual/highdpi/ImageProvider/qmldir
deleted file mode 100644
index add39d4ee8..0000000000
--- a/tests/manual/highdpi/ImageProvider/qmldir
+++ /dev/null
@@ -1 +0,0 @@
-plugin qmlimageproviderplugin
diff --git a/tests/manual/highdpi/borderimage.qml b/tests/manual/highdpi/borderimage.qml
index 6c292dc5b4..ac6f354925 100644
--- a/tests/manual/highdpi/borderimage.qml
+++ b/tests/manual/highdpi/borderimage.qml
@@ -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
 
 import QtQuick 2.0
 
diff --git a/tests/manual/highdpi/fillmodes.qml b/tests/manual/highdpi/fillmodes.qml
index 090a6caff2..7e12f615ba 100644
--- a/tests/manual/highdpi/fillmodes.qml
+++ b/tests/manual/highdpi/fillmodes.qml
@@ -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
 
 import QtQuick 2.0
 
diff --git a/tests/manual/highdpi/image.qml b/tests/manual/highdpi/image.qml
index b504076533..a5e6626df6 100644
--- a/tests/manual/highdpi/image.qml
+++ b/tests/manual/highdpi/image.qml
@@ -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
 
 import QtQuick 2.0
 
diff --git a/tests/manual/highdpi/image2.qml b/tests/manual/highdpi/image2.qml
index c308bfebfc..0d49f41bc3 100644
--- a/tests/manual/highdpi/image2.qml
+++ b/tests/manual/highdpi/image2.qml
@@ -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
 
 import QtQuick 2.0
 
diff --git a/tests/manual/highdpi/imageprovider.cpp b/tests/manual/highdpi/imageprovider.cpp
index 6b942a5327..b81b34e36e 100644
--- a/tests/manual/highdpi/imageprovider.cpp
+++ b/tests/manual/highdpi/imageprovider.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2017 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 
 #include <qqmlextensionplugin.h>
diff --git a/tests/manual/highdpi/imageprovider.qml b/tests/manual/highdpi/imageprovider.qml
index 348d12b2e1..ceadeaf472 100644
--- a/tests/manual/highdpi/imageprovider.qml
+++ b/tests/manual/highdpi/imageprovider.qml
@@ -1,8 +1,8 @@
 // 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
 
 import QtQuick 2.0
-import "ImageProvider"
+import "HighDPIImageProvider"
 
 Rectangle {
     width: 400
diff --git a/tests/manual/highdpi/imagesize.qml b/tests/manual/highdpi/imagesize.qml
index e612296d70..66bf3d7991 100644
--- a/tests/manual/highdpi/imagesize.qml
+++ b/tests/manual/highdpi/imagesize.qml
@@ -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
 
 import QtQuick 2.0
 
diff --git a/tests/manual/highdpi/mirror.qml b/tests/manual/highdpi/mirror.qml
index a121e2f4e7..e416f6248c 100644
--- a/tests/manual/highdpi/mirror.qml
+++ b/tests/manual/highdpi/mirror.qml
@@ -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
 
 import QtQuick 2.0
 
diff --git a/tests/manual/highdpi/sourcesize.qml b/tests/manual/highdpi/sourcesize.qml
index 302e817b88..f5fdb31e59 100644
--- a/tests/manual/highdpi/sourcesize.qml
+++ b/tests/manual/highdpi/sourcesize.qml
@@ -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
 
 import QtQuick 2.0
 
diff --git a/tests/manual/highdpi/svg.qml b/tests/manual/highdpi/svg.qml
index 11f61d6348..2bb125444e 100644
--- a/tests/manual/highdpi/svg.qml
+++ b/tests/manual/highdpi/svg.qml
@@ -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
 
 import QtQuick 2.0