summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnu Aliyas <[email protected]>2025-07-09 15:27:29 +0200
committerAnu Aliyas <[email protected]>2025-07-09 16:19:53 +0200
commit1c177f9aa481daf28c76ab7f195425f192f6eb40 (patch)
tree5e0992ae0482f66b12519d5623d0d5b19af841d0
parent5a97036b848c360d74cf1f118c35226186be9531 (diff)
[Lifecycle]Modernize CMakeLists.txtHEADdev
Modified CMake file to use qt_add_qml_module() to add QML files, instead of using the Qt 5 way of including QML files via .qrc. Fixes: QTBUG-138190 Pick-to: 6.10 6.9 Change-Id: I0779aaa986050d6fae0f185ca36136c23fd4db80 Reviewed-by: Michael BrĂ¼ning <[email protected]>
-rw-r--r--examples/webenginequick/lifecycle/CMakeLists.txt20
-rw-r--r--examples/webenginequick/lifecycle/main.cpp2
2 files changed, 14 insertions, 8 deletions
diff --git a/examples/webenginequick/lifecycle/CMakeLists.txt b/examples/webenginequick/lifecycle/CMakeLists.txt
index 46478b622..2da4246c0 100644
--- a/examples/webenginequick/lifecycle/CMakeLists.txt
+++ b/examples/webenginequick/lifecycle/CMakeLists.txt
@@ -30,14 +30,20 @@ target_link_libraries(lifecycle PUBLIC
Qt::WebEngineQuick
)
-# Resources:
+qt_add_qml_module(lifecycle
+ URI LifecycleUtils
+ VERSION 1.0
+ QML_FILES
+ "WebBrowser.qml"
+ "WebTab.qml"
+ "WebTabBar.qml"
+ "WebTabButton.qml"
+ "WebTabStack.qml"
+ "WebToolButton.qml"
+ RESOURCE_PREFIX /
+)
+
set(resources_resource_files
- "WebBrowser.qml"
- "WebTab.qml"
- "WebTabBar.qml"
- "WebTabButton.qml"
- "WebTabStack.qml"
- "WebToolButton.qml"
"qtquickcontrols2.conf"
)
diff --git a/examples/webenginequick/lifecycle/main.cpp b/examples/webenginequick/lifecycle/main.cpp
index 1f45ad0ee..185dc460c 100644
--- a/examples/webenginequick/lifecycle/main.cpp
+++ b/examples/webenginequick/lifecycle/main.cpp
@@ -16,6 +16,6 @@ int main(int argc, char *argv[])
QQmlApplicationEngine engine;
Utils utils;
engine.rootContext()->setContextProperty("utils", &utils);
- engine.load(QUrl(QStringLiteral("qrc:/WebBrowser.qml")));
+ engine.load(QUrl(QStringLiteral("qrc:/LifecycleUtils/WebBrowser.qml")));
return app.exec();
}