Avoid target name conflict

The qmlqtimeexampleplugin exists as a target name both in examples and
in a test; rename the one from the test.

Change-Id: I21b68f7d6228ceaee49ba28e55516b5b10ffce3a
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

12 files changed, 28 insertions, 28 deletions

diff --git a/tests/auto/qml/qmlbasicapp/CMakeLists.txt b/tests/auto/qml/qmlbasicapp/CMakeLists.txt
index 35b0bcfa1d..4926dc3e2b 100644
--- a/tests/auto/qml/qmlbasicapp/CMakeLists.txt
+++ b/tests/auto/qml/qmlbasicapp/CMakeLists.txt
@@ -18,7 +18,7 @@ qt6_add_qml_module(tst_qmlbasicapp
 )
 
 add_subdirectory(BasicExtension)
-add_subdirectory(TimeExample)
+add_subdirectory(TimeExample2)
 
 if(QT6_IS_SHARED_LIBS_BUILD)
     # Plugins are static, but qt6_import_qml_plugins() can't be used because
@@ -26,7 +26,7 @@ if(QT6_IS_SHARED_LIBS_BUILD)
     target_sources(tst_qmlbasicapp PRIVATE manual_imports.cpp)
     target_link_libraries(tst_qmlbasicapp PRIVATE
         additional_qml_module_plugin
-        qmlqtimeexampleplugin
+        qmlqtimeexample2plugin
     )
 else()
     # For fully static builds, let qmlimportscanner take care of everything
diff --git a/tests/auto/qml/qmlbasicapp/TimeExample/CMakeLists.txt b/tests/auto/qml/qmlbasicapp/TimeExample2/CMakeLists.txt
index bfb32ee2c9..060eb1edb8 100644
--- a/tests/auto/qml/qmlbasicapp/TimeExample/CMakeLists.txt
+++ b/tests/auto/qml/qmlbasicapp/TimeExample2/CMakeLists.txt
@@ -1,11 +1,11 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
-qt6_add_library(qmlqtimeexample STATIC)
-qt_autogen_tools_initial_setup(qmlqtimeexample)
-qt6_add_qml_module(qmlqtimeexample
+qt6_add_library(qmlqtimeexample2 STATIC)
+qt_autogen_tools_initial_setup(qmlqtimeexample2)
+qt6_add_qml_module(qmlqtimeexample2
     VERSION 1.0
-    URI "TimeExample"
+    URI "TimeExample2"
     RESOURCE_PREFIX "/"
     SOURCES
         timemodel.cpp timemodel.h
@@ -19,4 +19,4 @@ qt6_add_qml_module(qmlqtimeexample
     DEPENDENCIES
         QtQml
 )
-qt_autogen_tools_initial_setup(qmlqtimeexampleplugin)
+qt_autogen_tools_initial_setup(qmlqtimeexample2plugin)
diff --git a/tests/auto/qml/qmlbasicapp/TimeExample/Clock.qml b/tests/auto/qml/qmlbasicapp/TimeExample2/Clock.qml
index 3ee53b9c0b..3ee53b9c0b 100644
--- a/tests/auto/qml/qmlbasicapp/TimeExample/Clock.qml
+++ b/tests/auto/qml/qmlbasicapp/TimeExample2/Clock.qml
diff --git a/tests/auto/qml/qmlbasicapp/TimeExample/center.png b/tests/auto/qml/qmlbasicapp/TimeExample2/center.png
index 7fbd802a44..7fbd802a44 100644
--- a/tests/auto/qml/qmlbasicapp/TimeExample/center.png
+++ b/tests/auto/qml/qmlbasicapp/TimeExample2/center.png
diff --git a/tests/auto/qml/qmlbasicapp/TimeExample/clock.png b/tests/auto/qml/qmlbasicapp/TimeExample2/clock.png
index 462edacc0e..462edacc0e 100644
--- a/tests/auto/qml/qmlbasicapp/TimeExample/clock.png
+++ b/tests/auto/qml/qmlbasicapp/TimeExample2/clock.png
diff --git a/tests/auto/qml/qmlbasicapp/TimeExample/hour.png b/tests/auto/qml/qmlbasicapp/TimeExample2/hour.png
index 9f33fc5d48..9f33fc5d48 100644
--- a/tests/auto/qml/qmlbasicapp/TimeExample/hour.png
+++ b/tests/auto/qml/qmlbasicapp/TimeExample2/hour.png
diff --git a/tests/auto/qml/qmlbasicapp/TimeExample/minute.png b/tests/auto/qml/qmlbasicapp/TimeExample2/minute.png
index e2f216c897..e2f216c897 100644
--- a/tests/auto/qml/qmlbasicapp/TimeExample/minute.png
+++ b/tests/auto/qml/qmlbasicapp/TimeExample2/minute.png
diff --git a/tests/auto/qml/qmlbasicapp/TimeExample/timemodel.cpp b/tests/auto/qml/qmlbasicapp/TimeExample2/timemodel.cpp
index 7f2736a76b..7f2736a76b 100644
--- a/tests/auto/qml/qmlbasicapp/TimeExample/timemodel.cpp
+++ b/tests/auto/qml/qmlbasicapp/TimeExample2/timemodel.cpp
diff --git a/tests/auto/qml/qmlbasicapp/TimeExample/timemodel.h b/tests/auto/qml/qmlbasicapp/TimeExample2/timemodel.h
index b42542be31..b42542be31 100644
--- a/tests/auto/qml/qmlbasicapp/TimeExample/timemodel.h
+++ b/tests/auto/qml/qmlbasicapp/TimeExample2/timemodel.h
diff --git a/tests/auto/qml/qmlbasicapp/main.qml b/tests/auto/qml/qmlbasicapp/main.qml
index b9e61c39bc..37598a5235 100644
--- a/tests/auto/qml/qmlbasicapp/main.qml
+++ b/tests/auto/qml/qmlbasicapp/main.qml
@@ -1,7 +1,7 @@
 // Copyright (C) 2017 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
-import TimeExample // import types from the plugin
+import TimeExample2 // import types from the plugin
 import BasicExtension
 
 Clock { // this class is defined in QML (Clock.qml)
diff --git a/tests/auto/qml/qmlbasicapp/manual_imports.cpp b/tests/auto/qml/qmlbasicapp/manual_imports.cpp
index f1b30f8352..61df826af4 100644
--- a/tests/auto/qml/qmlbasicapp/manual_imports.cpp
+++ b/tests/auto/qml/qmlbasicapp/manual_imports.cpp
@@ -3,5 +3,5 @@
 
 #include <QtQml/qqmlextensionplugin.h>
 
-Q_IMPORT_QML_PLUGIN(TimeExamplePlugin)
+Q_IMPORT_QML_PLUGIN(TimeExample2Plugin)
 Q_IMPORT_QML_PLUGIN(BasicExtension)
diff --git a/tests/auto/qml/qmlbasicapp/tst_qmlbasicapp.cpp b/tests/auto/qml/qmlbasicapp/tst_qmlbasicapp.cpp
index 7bb7628587..6d61d4d7a3 100644
--- a/tests/auto/qml/qmlbasicapp/tst_qmlbasicapp.cpp
+++ b/tests/auto/qml/qmlbasicapp/tst_qmlbasicapp.cpp
@@ -48,15 +48,15 @@ void tst_basicapp::resourceFiles()
 {
     QVERIFY(QFile::exists(QStringLiteral(":/BasicApp/main.qml")));
     QVERIFY(QFile::exists(QStringLiteral(":/BasicApp/qmldir")));
-    QVERIFY(QFile::exists(QStringLiteral(":/TimeExample/Clock.qml")));
-    QVERIFY(QFile::exists(QStringLiteral(":/TimeExample/center.png")));
-    QVERIFY(QFile::exists(QStringLiteral(":/TimeExample/clock.png")));
-    QVERIFY(QFile::exists(QStringLiteral(":/TimeExample/hour.png")));
-    QVERIFY(QFile::exists(QStringLiteral(":/TimeExample/minute.png")));
-    QVERIFY(QFile::exists(QStringLiteral(":/TimeExample/qmldir")));
+    QVERIFY(QFile::exists(QStringLiteral(":/TimeExample2/Clock.qml")));
+    QVERIFY(QFile::exists(QStringLiteral(":/TimeExample2/center.png")));
+    QVERIFY(QFile::exists(QStringLiteral(":/TimeExample2/clock.png")));
+    QVERIFY(QFile::exists(QStringLiteral(":/TimeExample2/hour.png")));
+    QVERIFY(QFile::exists(QStringLiteral(":/TimeExample2/minute.png")));
+    QVERIFY(QFile::exists(QStringLiteral(":/TimeExample2/qmldir")));
 
     QVERIFY(!QFile::exists(QStringLiteral(":/BasicApp/tst_qmlbasicapp.qmltypes")));
-    QVERIFY(!QFile::exists(QStringLiteral(":/TimeExample/qmlqtimeexample.qmltypes")));
+    QVERIFY(!QFile::exists(QStringLiteral(":/TimeExample2/qmlqtimeexample2.qmltypes")));
 }
 
 void tst_basicapp::fileSystemFiles()
@@ -68,14 +68,14 @@ void tst_basicapp::fileSystemFiles()
     QVERIFY(QFile::exists(basedir + QStringLiteral("/BasicApp/main.qml")));
     QVERIFY(QFile::exists(basedir + QStringLiteral("/BasicApp/qmldir")));
     QVERIFY(QFile::exists(basedir + QStringLiteral("/BasicApp/tst_qmlbasicapp.qmltypes")));
-    QVERIFY(QFile::exists(basedir + QStringLiteral("/TimeExample/Clock.qml")));
-
-    QVERIFY(QFile::exists(basedir + QStringLiteral("/TimeExample/center.png")));
-    QVERIFY(QFile::exists(basedir + QStringLiteral("/TimeExample/clock.png")));
-    QVERIFY(QFile::exists(basedir + QStringLiteral("/TimeExample/hour.png")));
-    QVERIFY(QFile::exists(basedir + QStringLiteral("/TimeExample/minute.png")));
-    QVERIFY(QFile::exists(basedir + QStringLiteral("/TimeExample/qmldir")));
-    QVERIFY(QFile::exists(basedir + QStringLiteral("/TimeExample/qmlqtimeexample.qmltypes")));
+    QVERIFY(QFile::exists(basedir + QStringLiteral("/TimeExample2/Clock.qml")));
+
+    QVERIFY(QFile::exists(basedir + QStringLiteral("/TimeExample2/center.png")));
+    QVERIFY(QFile::exists(basedir + QStringLiteral("/TimeExample2/clock.png")));
+    QVERIFY(QFile::exists(basedir + QStringLiteral("/TimeExample2/hour.png")));
+    QVERIFY(QFile::exists(basedir + QStringLiteral("/TimeExample2/minute.png")));
+    QVERIFY(QFile::exists(basedir + QStringLiteral("/TimeExample2/qmldir")));
+    QVERIFY(QFile::exists(basedir + QStringLiteral("/TimeExample2/qmlqtimeexample2.qmltypes")));
 }
 
 void tst_basicapp::qmldirContents()
@@ -101,18 +101,18 @@ void tst_basicapp::qmldirContents()
     }
 
     {
-        QFile qmldir(basedir + "/TimeExample/qmldir");
+        QFile qmldir(basedir + "/TimeExample2/qmldir");
         QVERIFY(qmldir.open(QIODevice::ReadOnly));
         const QByteArray contents = qmldir.readAll();
-        QVERIFY(contents.contains("module TimeExample"));
+        QVERIFY(contents.contains("module TimeExample2"));
         QVERIFY(contents.contains("optional plugin"));
         QVERIFY(contents.contains("classname"));
         QVERIFY(contents.contains("typeinfo"));
         QVERIFY(contents.contains("depends QtQml"));
-        QVERIFY(contents.contains("prefer :/TimeExample/"));
+        QVERIFY(contents.contains("prefer :/TimeExample2/"));
         QVERIFY(contents.contains("Clock 1.0 Clock.qml"));
 
-        QFile qmldirInResources(":/TimeExample/qmldir");
+        QFile qmldirInResources(":/TimeExample2/qmldir");
         QVERIFY(qmldirInResources.open(QIODevice::ReadOnly));
         QCOMPARE(qmldirInResources.readAll(), contents);
     }