Restructure QML module of qmltc tests

Use a more canonical qmlcppcodegen-like structure, showcasing a better
QML module

As this change makes a single QML module instead of two QML modules
(for the _diskcache and _nodiskcache scenarios), there are pros and cons

Pros:
+ Prepares us for proper introduction of QQmlJSResourceFileMapper
+ Theorically allows tests to avoid (additional) weird imports

Cons:
- Denies the ability to test generated types under default QT_NAMESPACE
  (in addition to user-provided namespace). This is fine as we don't
  need this feature until we are able to compile QQC2 and modules alike

Task-number: QTBUG-99198
Task-number: QTBUG-100103
Pick-to: 6.3
Change-Id: I13a594a1859719bc0af3370029e6be7b1744656b
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

12 files changed, 183 insertions, 198 deletions

diff --git a/tests/auto/qml/qmltc/CMakeLists.txt b/tests/auto/qml/qmltc/CMakeLists.txt
index 258a330fad..4f468c41e9 100644
--- a/tests/auto/qml/qmltc/CMakeLists.txt
+++ b/tests/auto/qml/qmltc/CMakeLists.txt
@@ -1,148 +1,35 @@
-set(cpp_sources
-    tst_qmltc.h tst_qmltc.cpp
+add_subdirectory(data)
 
-    # test files:
+set(test_sources
     nameconflict.h nameconflict.cpp
-    # attached types:
-    cpptypes/testattachedtype.h cpptypes/testattachedtype.cpp
-    # grouped types:
-    cpptypes/testgroupedtype.h cpptypes/testgroupedtype.cpp
-    # private properties:
-    cpptypes/testprivateproperty.h cpptypes/testprivateproperty.cpp
-    cpptypes/private/testprivateproperty_p.h
-
-    cpptypes/typewithproperties.h cpptypes/typewithproperties.cpp
-)
-
-set(qml_sources
-    data/HelloWorld.qml
-    data/NameConflict.qml
-    data/simpleQtQuickTypes.qml
-    data/typeWithEnums.qml
-    data/methods.qml
-    data/properties.qml
-    data/ObjectWithId.qml
-    data/documentWithIds.qml
-    data/importNamespace.qml
-    data/ComponentType.qml
-    data/componentTypes.qml
-
-    data/signalHandlers.qml
-    data/javaScriptFunctions.qml
-    data/changingBindings.qml
-    data/propertyAlias.qml
-    data/propertyAlias_external.qml
-    data/propertyChangeHandler.qml
-    data/NestedHelloWorld.qml
-    data/ComponentHelloWorld.qml
-    data/listProperty.qml
-    data/listPropertySameName.qml
-    data/defaultProperty.qml
-    data/defaultPropertyCorrectSelection.qml
-    # data/defaultAlias.qml
-    data/propertyReturningFunction.qml
-    data/attachedProperty.qml
-    data/groupedProperty.qml
-    data/groupedProperty_qquicktext.qml
-    data/localImport.qml
-    data/localImport_explicit.qml
-    data/newPropertyBoundToOld.qml
-    data/oldPropertyBoundToNew.qml
-    data/nonLocalQmlPropertyBoundToAny.qml
-    data/localDerived.qml
-    data/justAnimation.qml
-    data/justAnimationOnAlias.qml
-    data/behaviorAndAnimation.qml
-    data/behaviorAndAnimationOnAlias.qml
-    data/singletonUser.qml
-    data/bindingsThroughIds.qml
-    data/localImport_context.qml
-    data/neighbors_context.qml
-    data/delegate_context.qml
-    data/nontrivial_context.qml
-    data/javascriptCaller.qml
-    data/listView.qml
-    data/bindingOnValueType.qml
-    data/keyEvents.qml
-    data/complexAliases.qml
-    data/PrivateProperty.qml
-    data/privatePropertySubclass.qml
-    data/calqlatrBits.qml
-    data/propertyChangeAndSignalHandlers.qml
-
-    # support types:
-    data/DefaultPropertySingleChild.qml
-    data/DefaultPropertyManyChildren.qml
-    data/LocallyImported.qml
-    data/LocalWithOnCompleted.qml
-    data/LocallyImported_context.qml
-    data/SingletonThing.qml
-)
-
-set(js_sources
-    data/subfolder/code.js
+    tst_qmltc.h tst_qmltc.cpp
 )
 
-set(common_libraries
-    Qt::Core
-    Qt::QmlPrivate
-    Qt::QuickPrivate
-    Qt::TestPrivate
-    Qt::Gui # QColor, QMatrix4x4, ...
+set(qmltc_module_libs
+    qmltc_test_module
+    # We need to link against a <module>plugin here for the following:
+    # - Properly see `import QmltcTests` (that could be resolved differently
+    #   but this works as well)
+    # - Properly see C++ types exposed to QML in the engine (we need C++
+    #   automatic type registration that comes from the plugin)
+    qmltc_test_moduleplugin
 )
 
-set_source_files_properties(data/NameConflict.qml PROPERTIES
-    QT_QMLTC_FILE_BASENAME ResolvedNameConflict)
-
 qt_internal_add_test(tst_qmltc_diskcache
-    SOURCES
-        ${cpp_sources}
-    LIBRARIES
-        ${common_libraries}
-    INCLUDE_DIRECTORIES
-        cpptypes/
-)
-qt6_add_qml_module(tst_qmltc_diskcache
-    VERSION 1.0
-    URI QmltcTests
-    QML_FILES
-        ${qml_sources}
-        ${js_sources}
-    OUTPUT_DIRECTORY diskcache/QmltcTests
+    SOURCES ${test_sources}
+    LIBRARIES ${qmltc_module_libs}
 )
 target_compile_definitions(tst_qmltc_diskcache PRIVATE
     QMLTC_TESTS_DISABLE_CACHE=0
 )
-qt_internal_target_compile_qml_to_cpp(tst_qmltc_diskcache
-    NAMESPACE QmltcTest
-    QML_FILES
-        ${qml_sources}
-)
 
 qt_internal_add_test(tst_qmltc_nodiskcache
-    SOURCES
-        ${cpp_sources}
-    LIBRARIES
-        ${common_libraries}
-    INCLUDE_DIRECTORIES
-        cpptypes/
-)
-qt6_add_qml_module(tst_qmltc_nodiskcache
-    VERSION 1.0
-    URI QmltcTests
-    QML_FILES
-        ${qml_sources}
-        ${js_sources}
-    OUTPUT_DIRECTORY nodiskcache/QmltcTests
+    SOURCES ${test_sources}
+    LIBRARIES ${qmltc_module_libs}
 )
 target_compile_definitions(tst_qmltc_nodiskcache PRIVATE
     QMLTC_TESTS_DISABLE_CACHE=1
 )
-qt_internal_target_compile_qml_to_cpp(tst_qmltc_nodiskcache
-    # NAMESPACE QmltcTest # use QT_NAMESPACE instead
-    QML_FILES
-        ${qml_sources}
-)
 
 # Add qmltc documentation example to the tests. This is not beautiful but allows
 # to nicely test the documentation snippets automatically (and so making sure
diff --git a/tests/auto/qml/qmltc/data/CMakeLists.txt b/tests/auto/qml/qmltc/data/CMakeLists.txt
new file mode 100644
index 0000000000..87c5759de1
--- /dev/null
+++ b/tests/auto/qml/qmltc/data/CMakeLists.txt
@@ -0,0 +1,115 @@
+set(cpp_sources
+    # attached types:
+    cpptypes/testattachedtype.h cpptypes/testattachedtype.cpp
+    # grouped types:
+    cpptypes/testgroupedtype.h cpptypes/testgroupedtype.cpp
+    # private properties:
+    cpptypes/testprivateproperty.h cpptypes/testprivateproperty.cpp
+    cpptypes/private/testprivateproperty_p.h
+
+    cpptypes/typewithproperties.h cpptypes/typewithproperties.cpp
+)
+
+set(qml_sources
+    HelloWorld.qml
+    NameConflict.qml
+    simpleQtQuickTypes.qml
+    typeWithEnums.qml
+    methods.qml
+    properties.qml
+    ObjectWithId.qml
+    documentWithIds.qml
+    importNamespace.qml
+    ComponentType.qml
+    componentTypes.qml
+
+    signalHandlers.qml
+    javaScriptFunctions.qml
+    changingBindings.qml
+    propertyAlias.qml
+    propertyAlias_external.qml
+    propertyChangeHandler.qml
+    NestedHelloWorld.qml
+    ComponentHelloWorld.qml
+    listProperty.qml
+    listPropertySameName.qml
+    defaultProperty.qml
+    defaultPropertyCorrectSelection.qml
+    # defaultAlias.qml
+    propertyReturningFunction.qml
+    attachedProperty.qml
+    groupedProperty.qml
+    groupedProperty_qquicktext.qml
+    localImport.qml
+    localImport_explicit.qml
+    newPropertyBoundToOld.qml
+    oldPropertyBoundToNew.qml
+    nonLocalQmlPropertyBoundToAny.qml
+    localDerived.qml
+    justAnimation.qml
+    justAnimationOnAlias.qml
+    behaviorAndAnimation.qml
+    behaviorAndAnimationOnAlias.qml
+    singletonUser.qml
+    bindingsThroughIds.qml
+    localImport_context.qml
+    neighbors_context.qml
+    delegate_context.qml
+    nontrivial_context.qml
+    javascriptCaller.qml
+    listView.qml
+    bindingOnValueType.qml
+    keyEvents.qml
+    complexAliases.qml
+    PrivateProperty.qml
+    privatePropertySubclass.qml
+    calqlatrBits.qml
+    propertyChangeAndSignalHandlers.qml
+
+    # support types:
+    DefaultPropertySingleChild.qml
+    DefaultPropertyManyChildren.qml
+    LocallyImported.qml
+    LocalWithOnCompleted.qml
+    LocallyImported_context.qml
+    SingletonThing.qml
+)
+
+set(js_sources
+    subfolder/code.js
+)
+
+set(common_libraries
+    Qt::Core
+    Qt::QmlPrivate
+    Qt::QuickPrivate
+    Qt::TestPrivate
+    Qt::Gui # QColor, QMatrix4x4, ...
+)
+
+set_source_files_properties(NameConflict.qml PROPERTIES
+    QT_QMLTC_FILE_BASENAME ResolvedNameConflict)
+
+qt_add_library(qmltc_test_module STATIC)
+qt_autogen_tools_initial_setup(qmltc_test_module)
+
+# use PUBLIC everywhere to simplify the build of the test binary
+target_include_directories(qmltc_test_module PUBLIC cpptypes/)
+target_link_libraries(qmltc_test_module PUBLIC ${common_libraries})
+
+qt6_add_qml_module(qmltc_test_module
+    VERSION 1.0
+    URI QmltcTests
+    SOURCES
+        ${cpp_sources}
+    QML_FILES
+        ${qml_sources}
+        ${js_sources}
+)
+qt_internal_target_compile_qml_to_cpp(qmltc_test_module
+    NAMESPACE QmltcTest
+    QML_FILES
+        ${qml_sources}
+)
+
+qt_autogen_tools_initial_setup(qmltc_test_moduleplugin)
diff --git a/tests/auto/qml/qmltc/cpptypes/private/testprivateproperty_p.h b/tests/auto/qml/qmltc/data/cpptypes/private/testprivateproperty_p.h
index ba5d1b2e14..ba5d1b2e14 100644
--- a/tests/auto/qml/qmltc/cpptypes/private/testprivateproperty_p.h
+++ b/tests/auto/qml/qmltc/data/cpptypes/private/testprivateproperty_p.h
diff --git a/tests/auto/qml/qmltc/cpptypes/testattachedtype.cpp b/tests/auto/qml/qmltc/data/cpptypes/testattachedtype.cpp
index 04ca79de35..04ca79de35 100644
--- a/tests/auto/qml/qmltc/cpptypes/testattachedtype.cpp
+++ b/tests/auto/qml/qmltc/data/cpptypes/testattachedtype.cpp
diff --git a/tests/auto/qml/qmltc/cpptypes/testattachedtype.h b/tests/auto/qml/qmltc/data/cpptypes/testattachedtype.h
index 62af6c27c7..62af6c27c7 100644
--- a/tests/auto/qml/qmltc/cpptypes/testattachedtype.h
+++ b/tests/auto/qml/qmltc/data/cpptypes/testattachedtype.h
diff --git a/tests/auto/qml/qmltc/cpptypes/testgroupedtype.cpp b/tests/auto/qml/qmltc/data/cpptypes/testgroupedtype.cpp
index 403fabf7a2..403fabf7a2 100644
--- a/tests/auto/qml/qmltc/cpptypes/testgroupedtype.cpp
+++ b/tests/auto/qml/qmltc/data/cpptypes/testgroupedtype.cpp
diff --git a/tests/auto/qml/qmltc/cpptypes/testgroupedtype.h b/tests/auto/qml/qmltc/data/cpptypes/testgroupedtype.h
index 609fe6df57..609fe6df57 100644
--- a/tests/auto/qml/qmltc/cpptypes/testgroupedtype.h
+++ b/tests/auto/qml/qmltc/data/cpptypes/testgroupedtype.h
diff --git a/tests/auto/qml/qmltc/cpptypes/testprivateproperty.cpp b/tests/auto/qml/qmltc/data/cpptypes/testprivateproperty.cpp
index c06ffd876e..c06ffd876e 100644
--- a/tests/auto/qml/qmltc/cpptypes/testprivateproperty.cpp
+++ b/tests/auto/qml/qmltc/data/cpptypes/testprivateproperty.cpp
diff --git a/tests/auto/qml/qmltc/cpptypes/testprivateproperty.h b/tests/auto/qml/qmltc/data/cpptypes/testprivateproperty.h
index 956b862f12..956b862f12 100644
--- a/tests/auto/qml/qmltc/cpptypes/testprivateproperty.h
+++ b/tests/auto/qml/qmltc/data/cpptypes/testprivateproperty.h
diff --git a/tests/auto/qml/qmltc/cpptypes/typewithproperties.cpp b/tests/auto/qml/qmltc/data/cpptypes/typewithproperties.cpp
index fe4fc41020..fe4fc41020 100644
--- a/tests/auto/qml/qmltc/cpptypes/typewithproperties.cpp
+++ b/tests/auto/qml/qmltc/data/cpptypes/typewithproperties.cpp
diff --git a/tests/auto/qml/qmltc/cpptypes/typewithproperties.h b/tests/auto/qml/qmltc/data/cpptypes/typewithproperties.h
index 51d7eca015..51d7eca015 100644
--- a/tests/auto/qml/qmltc/cpptypes/typewithproperties.h
+++ b/tests/auto/qml/qmltc/data/cpptypes/typewithproperties.h
diff --git a/tests/auto/qml/qmltc/tst_qmltc.cpp b/tests/auto/qml/qmltc/tst_qmltc.cpp
index 29cd95de31..a956c857dd 100644
--- a/tests/auto/qml/qmltc/tst_qmltc.cpp
+++ b/tests/auto/qml/qmltc/tst_qmltc.cpp
@@ -96,25 +96,12 @@
 
 #include <QtTest/private/qemulationdetector_p.h>
 
-#define SKIP_DUE_TO_QT_NAMESPACE 0
-
-// on top of testing different cache configurations, we can also test namespace
-// generation for the test classes using the same macro
-#ifdef QMLTC_TESTS_DISABLE_CACHE
-#    if QMLTC_TESTS_DISABLE_CACHE
-#        define PREPEND_NAMESPACE(name) QT_PREPEND_NAMESPACE(name)
-#        ifdef QT_NAMESPACE
-#            undef SKIP_DUE_TO_QT_NAMESPACE
-#            define SKIP_DUE_TO_QT_NAMESPACE 1 // ### QTBUG-99198
-#        endif
-#    else
-#        define PREPEND_NAMESPACE(name)                                                            \
-            ::QmltcTest::name // silent contract that the namespace is QmltcTest
-#    endif
-#else
+#ifndef QMLTC_TESTS_DISABLE_CACHE
 #    error "QMLTC_TESTS_DISABLE_CACHE is supposed to be defined and be equal to either 0 or 1"
 #endif
 
+#define PREPEND_NAMESPACE(name) ::QmltcTest::name // silent contract that the namespace is QmltcTest
+
 tst_qmltc::tst_qmltc()
 {
 #if defined(QMLTC_TESTS_DISABLE_CACHE) && QMLTC_TESTS_DISABLE_CACHE
@@ -132,53 +119,53 @@ void tst_qmltc::initTestCase()
     // Note: just check whether the QML code is valid. QQmlComponent is good for
     // it. also, we can use qrc to make sure the file is in the resource system.
     QUrl urls[] = {
-        QUrl("qrc:/QmltcTests/data/NameConflict.qml"),
-        QUrl("qrc:/QmltcTests/data/HelloWorld.qml"),
-        QUrl("qrc:/QmltcTests/data/simpleQtQuickTypes.qml"),
-        QUrl("qrc:/QmltcTests/data/typeWithEnums.qml"),
-        QUrl("qrc:/QmltcTests/data/methods.qml"),
-        QUrl("qrc:/QmltcTests/data/properties.qml"),
-        QUrl("qrc:/QmltcTests/data/ObjectWithId.qml"),
-        QUrl("qrc:/QmltcTests/data/documentWithIds.qml"),
-        QUrl("qrc:/QmltcTests/data/importNamespace.qml"),
-
-        QUrl("qrc:/QmltcTests/data/signalHandlers.qml"),
-        QUrl("qrc:/QmltcTests/data/javaScriptFunctions.qml"),
-        QUrl("qrc:/QmltcTests/data/changingBindings.qml"),
-        QUrl("qrc:/QmltcTests/data/propertyAlias.qml"),
-        QUrl("qrc:/QmltcTests/data/propertyAlias_external.qml"),
-        QUrl("qrc:/QmltcTests/data/complexAliases.qml"),
-        QUrl("qrc:/QmltcTests/data/propertyChangeHandler.qml"),
-        QUrl("qrc:/QmltcTests/data/NestedHelloWorld.qml"),
-        QUrl("qrc:/QmltcTests/data/ComponentHelloWorld.qml"),
-        QUrl("qrc:/QmltcTests/data/propertyReturningFunction.qml"),
-        QUrl("qrc:/QmltcTests/data/listProperty.qml"),
-        QUrl("qrc:/QmltcTests/data/listPropertySameName.qml"),
-        QUrl("qrc:/QmltcTests/data/defaultProperty.qml"),
-        QUrl("qrc:/QmltcTests/data/defaultPropertyCorrectSelection.qml"),
-        QUrl("qrc:/QmltcTests/data/attachedProperty.qml"),
-        QUrl("qrc:/QmltcTests/data/groupedProperty.qml"),
-        QUrl("qrc:/QmltcTests/data/groupedProperty_qquicktext.qml"),
-        QUrl("qrc:/QmltcTests/data/localImport.qml"),
-        QUrl("qrc:/QmltcTests/data/newPropertyBoundToOld.qml"),
-        QUrl("qrc:/QmltcTests/data/oldPropertyBoundToNew.qml"),
-        QUrl("qrc:/QmltcTests/data/nonLocalQmlPropertyBoundToAny.qml"),
-        QUrl("qrc:/QmltcTests/data/justAnimation.qml"),
-        QUrl("qrc:/QmltcTests/data/justAnimationOnAlias.qml"),
-        QUrl("qrc:/QmltcTests/data/behaviorAndAnimation.qml"),
-        QUrl("qrc:/QmltcTests/data/behaviorAndAnimationOnAlias.qml"),
-        QUrl("qrc:/QmltcTests/data/bindingsThroughIds.qml"),
-        QUrl("qrc:/QmltcTests/data/localImport_context.qml"),
-        QUrl("qrc:/QmltcTests/data/neighbors_context.qml"),
-        QUrl("qrc:/QmltcTests/data/delegate_context.qml"),
-        QUrl("qrc:/QmltcTests/data/nontrivial_context.qml"),
-        QUrl("qrc:/QmltcTests/data/javascriptCaller.qml"),
-        QUrl("qrc:/QmltcTests/data/listView.qml"),
-        QUrl("qrc:/QmltcTests/data/bindingOnValueType.qml"),
-        QUrl("qrc:/QmltcTests/data/keyEvents.qml"),
-        QUrl("qrc:/QmltcTests/data/PrivateProperty.qml"),
-        QUrl("qrc:/QmltcTests/data/privatePropertySubclass.qml"),
-        QUrl("qrc:/QmltcTests/data/calqlatrBits.qml"),
+        QUrl("qrc:/QmltcTests/NameConflict.qml"),
+        QUrl("qrc:/QmltcTests/HelloWorld.qml"),
+        QUrl("qrc:/QmltcTests/simpleQtQuickTypes.qml"),
+        QUrl("qrc:/QmltcTests/typeWithEnums.qml"),
+        QUrl("qrc:/QmltcTests/methods.qml"),
+        QUrl("qrc:/QmltcTests/properties.qml"),
+        QUrl("qrc:/QmltcTests/ObjectWithId.qml"),
+        QUrl("qrc:/QmltcTests/documentWithIds.qml"),
+        QUrl("qrc:/QmltcTests/importNamespace.qml"),
+
+        QUrl("qrc:/QmltcTests/signalHandlers.qml"),
+        QUrl("qrc:/QmltcTests/javaScriptFunctions.qml"),
+        QUrl("qrc:/QmltcTests/changingBindings.qml"),
+        QUrl("qrc:/QmltcTests/propertyAlias.qml"),
+        QUrl("qrc:/QmltcTests/propertyAlias_external.qml"),
+        QUrl("qrc:/QmltcTests/complexAliases.qml"),
+        QUrl("qrc:/QmltcTests/propertyChangeHandler.qml"),
+        QUrl("qrc:/QmltcTests/NestedHelloWorld.qml"),
+        QUrl("qrc:/QmltcTests/ComponentHelloWorld.qml"),
+        QUrl("qrc:/QmltcTests/propertyReturningFunction.qml"),
+        QUrl("qrc:/QmltcTests/listProperty.qml"),
+        QUrl("qrc:/QmltcTests/listPropertySameName.qml"),
+        QUrl("qrc:/QmltcTests/defaultProperty.qml"),
+        QUrl("qrc:/QmltcTests/defaultPropertyCorrectSelection.qml"),
+        QUrl("qrc:/QmltcTests/attachedProperty.qml"),
+        QUrl("qrc:/QmltcTests/groupedProperty.qml"),
+        QUrl("qrc:/QmltcTests/groupedProperty_qquicktext.qml"),
+        QUrl("qrc:/QmltcTests/localImport.qml"),
+        QUrl("qrc:/QmltcTests/newPropertyBoundToOld.qml"),
+        QUrl("qrc:/QmltcTests/oldPropertyBoundToNew.qml"),
+        QUrl("qrc:/QmltcTests/nonLocalQmlPropertyBoundToAny.qml"),
+        QUrl("qrc:/QmltcTests/justAnimation.qml"),
+        QUrl("qrc:/QmltcTests/justAnimationOnAlias.qml"),
+        QUrl("qrc:/QmltcTests/behaviorAndAnimation.qml"),
+        QUrl("qrc:/QmltcTests/behaviorAndAnimationOnAlias.qml"),
+        QUrl("qrc:/QmltcTests/bindingsThroughIds.qml"),
+        QUrl("qrc:/QmltcTests/localImport_context.qml"),
+        QUrl("qrc:/QmltcTests/neighbors_context.qml"),
+        QUrl("qrc:/QmltcTests/delegate_context.qml"),
+        QUrl("qrc:/QmltcTests/nontrivial_context.qml"),
+        QUrl("qrc:/QmltcTests/javascriptCaller.qml"),
+        QUrl("qrc:/QmltcTests/listView.qml"),
+        QUrl("qrc:/QmltcTests/bindingOnValueType.qml"),
+        QUrl("qrc:/QmltcTests/keyEvents.qml"),
+        QUrl("qrc:/QmltcTests/PrivateProperty.qml"),
+        QUrl("qrc:/QmltcTests/privatePropertySubclass.qml"),
+        QUrl("qrc:/QmltcTests/calqlatrBits.qml"),
     };
 
     QQmlEngine e;
@@ -952,7 +939,7 @@ void tst_qmltc::propertyChangeHandler()
     {
         QQmlEngine e;
         QQmlComponent c(&e);
-        c.loadUrl(QUrl("qrc:/QmltcTests/data/propertyChangeHandler.qml"));
+        c.loadUrl(QUrl("qrc:/QmltcTests/propertyChangeHandler.qml"));
         QScopedPointer<QObject> root(c.create());
         QVERIFY2(root, qPrintable(c.errorString()));
         QCOMPARE(root->property("watcher").toInt(), 42);
@@ -1467,7 +1454,7 @@ void tst_qmltc::contextHierarchy_rootBaseIsQml()
     {
         QQmlEngine e;
         QQmlComponent c(&e);
-        c.loadUrl(QUrl("qrc:/QmltcTests/data/localImport_context.qml"));
+        c.loadUrl(QUrl("qrc:/QmltcTests/localImport_context.qml"));
         QScopedPointer<QObject> root(c.create());
         QVERIFY2(root, qPrintable(c.errorString()));
         // sanity
@@ -1566,7 +1553,7 @@ void tst_qmltc::contextHierarchy_delegate()
     {
         QQmlEngine e;
         QQmlComponent c(&e);
-        c.loadUrl(QUrl("qrc:/QmltcTests/data/delegate_context.qml"));
+        c.loadUrl(QUrl("qrc:/QmltcTests/delegate_context.qml"));
         QScopedPointer<QObject> root(c.create());
         QVERIFY2(root, qPrintable(c.errorString()));
         QQmlListReference data(root.get(), "data");
@@ -1639,10 +1626,6 @@ void tst_qmltc::javascriptImport()
 
 void tst_qmltc::listView()
 {
-#if SKIP_DUE_TO_QT_NAMESPACE
-    QSKIP("QTBUG-99198: QT_NAMESPACE used, this test will fail in QVariant::setValue().");
-#endif
-
     if (QTestPrivate::isRunningArmOnX86())
         QSKIP("Flaky on QEMU. Sometimes can't correctly run JavaScript code, QTBUG-99355");