Fix generation of names in qmldir files

Dots in QML module names are useless because you cannot instantiate a
component with a dot in its name. We might as well strip all the
extensions when adding components to a qmldir file. This takes care of
.ui.qml as well.

Furthermore, JavaScript files must not be listed because they cannot be
instantiated as QML components.

Change-Id: I9782420ea79fef1d5eedef97cf7a748b96ddbe2b
Fixes: QTBUG-96301
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Tapani Mattila <tapani.mattila@qt.io>
(cherry picked from commit 14a3b34906be5b749ebc6b6c1d8f6807fff8fd88)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

6 files changed, 31 insertions, 2 deletions

diff --git a/src/qml/Qt6QmlMacros.cmake b/src/qml/Qt6QmlMacros.cmake
index ef736cf905..58e338d103 100644
--- a/src/qml/Qt6QmlMacros.cmake
+++ b/src/qml/Qt6QmlMacros.cmake
@@ -1420,11 +1420,21 @@ function(qt6_target_qml_sources target)
         if(NOT no_qmldir AND NOT skip_qmldir)
             get_source_file_property(qml_file_typename ${qml_file_src} QT_QML_SOURCE_TYPENAME)
             if (NOT qml_file_typename)
-                get_filename_component(qml_file_typename ${qml_file_src} NAME_WLE)
+                get_filename_component(qml_file_ext ${qml_file_src} EXT)
+                if (NOT qml_file_ext STREQUAL ".js" AND NOT qml_file_ext STREQUAL ".mjs")
+                    get_filename_component(qml_file_typename ${qml_file_src} NAME_WE)
+                endif()
             endif()
 
             # Do not add qmldir entries for lowercase names. Those are not components.
-            if (qml_file_typename MATCHES "^[A-Z]")
+            if (qml_file_typename AND qml_file_typename MATCHES "^[A-Z]")
+                if (qml_file_ext AND NOT qml_file_ext STREQUAL ".qml" AND NOT qml_file_ext STREQUAL ".ui.qml")
+                    message(AUTHOR_WARNING
+                        "${qml_file_src} has a file extension different from .qml and .ui.qml. "
+                        "This leads to unexpected component names."
+                    )
+                endif()
+
                 # We previously accepted the singular form of this property name
                 # during tech preview. Issue a warning for that, but still
                 # honor it. The plural form will override it if both are set.
diff --git a/tests/auto/qml/qmlbasicapp/BasicExtension/CMakeLists.txt b/tests/auto/qml/qmlbasicapp/BasicExtension/CMakeLists.txt
index 14384512c5..3a1074bf53 100644
--- a/tests/auto/qml/qmlbasicapp/BasicExtension/CMakeLists.txt
+++ b/tests/auto/qml/qmlbasicapp/BasicExtension/CMakeLists.txt
@@ -11,4 +11,6 @@ qt6_add_qml_module(additional_qml_module
     URI "BasicExtension"
     QML_FILES
         Extension.qml
+        More.ui.qml
+        Less.js
 )
diff --git a/tests/auto/qml/qmlbasicapp/BasicExtension/Less.js b/tests/auto/qml/qmlbasicapp/BasicExtension/Less.js
new file mode 100644
index 0000000000..585b645dca
--- /dev/null
+++ b/tests/auto/qml/qmlbasicapp/BasicExtension/Less.js
@@ -0,0 +1 @@
+function bar() {}
diff --git a/tests/auto/qml/qmlbasicapp/BasicExtension/More.ui.qml b/tests/auto/qml/qmlbasicapp/BasicExtension/More.ui.qml
new file mode 100644
index 0000000000..014d794229
--- /dev/null
+++ b/tests/auto/qml/qmlbasicapp/BasicExtension/More.ui.qml
@@ -0,0 +1,3 @@
+import QtQml
+
+QtObject { objectName: "ui.qml" }
diff --git a/tests/auto/qml/qmlbasicapp/main.qml b/tests/auto/qml/qmlbasicapp/main.qml
index 85dfa394d2..dc572d29af 100644
--- a/tests/auto/qml/qmlbasicapp/main.qml
+++ b/tests/auto/qml/qmlbasicapp/main.qml
@@ -57,4 +57,5 @@ Clock { // this class is defined in QML (Clock.qml)
     hours: time.hour
     minutes: time.minute
     property Extension extension // from BasicExtension
+    property More more: More {}
 }
diff --git a/tests/auto/qml/qmlbasicapp/tst_qmlbasicapp.cpp b/tests/auto/qml/qmlbasicapp/tst_qmlbasicapp.cpp
index f6adfaa943..4d62fc46b6 100644
--- a/tests/auto/qml/qmlbasicapp/tst_qmlbasicapp.cpp
+++ b/tests/auto/qml/qmlbasicapp/tst_qmlbasicapp.cpp
@@ -57,6 +57,10 @@ void tst_basicapp::loadComponent()
     const int minute = o->property("minutes").toInt();
     QVERIFY(minute >= time.minute() - 1);
     QVERIFY(minute <= time.minute() + 1);
+
+    QObject *more = qvariant_cast<QObject*>(o->property("more"));
+    QVERIFY(more);
+    QCOMPARE(more->objectName(), QStringLiteral("ui.qml"));
 }
 
 void tst_basicapp::resourceFiles()
@@ -123,6 +127,14 @@ void tst_basicapp::qmldirContents()
         QVERIFY(qmldirInResources.open(QIODevice::ReadOnly));
         QCOMPARE(qmldirInResources.readAll(), contents);
     }
+
+    {
+        QFile qmldir(QCoreApplication::applicationDirPath() + "/BasicExtension/qmldir");
+        QVERIFY(qmldir.open(QIODevice::ReadOnly));
+        const QByteArray contents = qmldir.readAll();
+        QVERIFY(contents.contains("More 1.0 More.ui.qml"));
+        QVERIFY(!contents.contains("Less.js"));
+    }
 }
 
 QTEST_MAIN(tst_basicapp)