embeddedinwidgets: Use modern loadFromModule API

Replaces 4f4a915ded1ddfb91ed0062d7079f5566400f422

Fixes: QTBUG-119318
Change-Id: I3c508a8b5b7f060cdb2b0eac087c24dab0f552e2
Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

6 files changed, 14 insertions, 13 deletions

diff --git a/examples/quick/embeddedinwidgets/CMakeLists.txt b/examples/quick/embeddedinwidgets/CMakeLists.txt
index dac1a614de..e3f3d43a71 100644
--- a/examples/quick/embeddedinwidgets/CMakeLists.txt
+++ b/examples/quick/embeddedinwidgets/CMakeLists.txt
@@ -29,11 +29,9 @@ target_link_libraries(embeddedinwidgetsexample PRIVATE
 qt_add_qml_module(embeddedinwidgetsexample
     URI embeddedinwidgets
     QML_FILES
-        "main.qml"
+        "Main.qml"
     RESOURCES
         "reflect.frag.qsb"
-    RESOURCE_PREFIX /embeddedinwidgets
-    NO_RESOURCE_TARGET_PATH
 )
 
 install(TARGETS embeddedinwidgetsexample
diff --git a/examples/quick/embeddedinwidgets/main.qml b/examples/quick/embeddedinwidgets/Main.qml
index 1408e8f261..1408e8f261 100644
--- a/examples/quick/embeddedinwidgets/main.qml
+++ b/examples/quick/embeddedinwidgets/Main.qml
diff --git a/examples/quick/embeddedinwidgets/embeddedinwidgets.pro b/examples/quick/embeddedinwidgets/embeddedinwidgets.pro
index 936da9dfeb..493f462370 100644
--- a/examples/quick/embeddedinwidgets/embeddedinwidgets.pro
+++ b/examples/quick/embeddedinwidgets/embeddedinwidgets.pro
@@ -3,10 +3,15 @@ QT += widgets quick
 
 SOURCES += main.cpp
 
-OTHER_FILES += main.qml
+OTHER_FILES += Main.qml
 
-RESOURCES += \
-    embeddedinwidgets.qrc
+qml_resources.files = \
+   qmldir \
+   Main.qml
+
+qml_resources.prefix = /qt/qml/embeddedinwidgets
+
+RESOURCES += qml_resources
 
 target.path = $$[QT_INSTALL_EXAMPLES]/quick/embeddedinwidgets
 INSTALLS += target
diff --git a/examples/quick/embeddedinwidgets/embeddedinwidgets.qrc b/examples/quick/embeddedinwidgets/embeddedinwidgets.qrc
deleted file mode 100644
index 9fc33601d0..0000000000
--- a/examples/quick/embeddedinwidgets/embeddedinwidgets.qrc
+++ /dev/null
@@ -1,6 +0,0 @@
-<RCC>
-    <qresource prefix="/embeddedinwidgets">
-        <file>main.qml</file>
-        <file>reflect.frag.qsb</file>
-    </qresource>
-</RCC>
diff --git a/examples/quick/embeddedinwidgets/main.cpp b/examples/quick/embeddedinwidgets/main.cpp
index 4516272406..2cc70e195e 100644
--- a/examples/quick/embeddedinwidgets/main.cpp
+++ b/examples/quick/embeddedinwidgets/main.cpp
@@ -38,7 +38,7 @@ MainWindow::MainWindow()
             this, &MainWindow::quickViewStatusChanged);
     connect(m_quickView, &QQuickWindow::sceneGraphError,
             this, &MainWindow::sceneGraphError);
-    m_quickView->setSource(QUrl(QStringLiteral("qrc:///embeddedinwidgets/main.qml")));
+    m_quickView->loadFromModule("embeddedinwidgets", "Main");
 
     QWidget *container = QWidget::createWindowContainer(m_quickView);
     container->setMinimumSize(m_quickView->size());
diff --git a/examples/quick/embeddedinwidgets/qmldir b/examples/quick/embeddedinwidgets/qmldir
new file mode 100644
index 0000000000..06d6e62c19
--- /dev/null
+++ b/examples/quick/embeddedinwidgets/qmldir
@@ -0,0 +1,4 @@
+module embeddedinwidgets
+prefer :/qt/qml/embeddedinwidgets/
+Main 254.0 Main.qml
+