summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Köhne <kai.koehne@qt.io>2024-02-27 08:44:09 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2024-03-04 14:06:52 +0000
commit92e216b98f339eadf2ca19d7fe4e4b8c8b8f6139 (patch)
tree882f24730bd25152a89fa7b79521fbd2fe1a846e
parent70520c0108893040043417f67b52278c0f659b62 (diff)
Fix QTP0001 warning for Showroom example
Pick-to: 6.6 Fixes: QTBUG-122767 Change-Id: I65be5eb533364708284e368bef33b7066ecd30d6 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit d3d420a7c095a884efff96a4d93dd6637eba9445) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--examples/demos/FX_Material_Showroom/CMakeLists.txt2
-rw-r--r--examples/demos/FX_Material_Showroom/src/main.cpp5
2 files changed, 3 insertions, 4 deletions
diff --git a/examples/demos/FX_Material_Showroom/CMakeLists.txt b/examples/demos/FX_Material_Showroom/CMakeLists.txt
index 21b8d81e4..affa69b9b 100644
--- a/examples/demos/FX_Material_Showroom/CMakeLists.txt
+++ b/examples/demos/FX_Material_Showroom/CMakeLists.txt
@@ -13,6 +13,8 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/demos/${PROJECT_NAME}")
find_package(Qt6 6.5 REQUIRED COMPONENTS Gui Qml Quick Quick3D)
+qt_standard_project_setup(REQUIRES 6.5)
+
qt_add_executable(FxMaterialShowroomApp
src/app_environment.h
src/main.cpp
diff --git a/examples/demos/FX_Material_Showroom/src/main.cpp b/examples/demos/FX_Material_Showroom/src/main.cpp
index 890170f91..34a08ca4c 100644
--- a/examples/demos/FX_Material_Showroom/src/main.cpp
+++ b/examples/demos/FX_Material_Showroom/src/main.cpp
@@ -16,16 +16,13 @@ int main(int argc, char *argv[])
QGuiApplication app(argc, argv);
QQmlApplicationEngine engine;
- const QUrl url(u"qrc:Main/main.qml"_qs);
+ const QUrl url(u"qrc:/qt/qml/Main/main.qml"_qs);
QObject::connect(&engine, &QQmlApplicationEngine::objectCreated, &app,
[url](QObject *obj, const QUrl &objUrl) {
if (!obj && url == objUrl)
QCoreApplication::exit(-1);
}, Qt::QueuedConnection);
- engine.addImportPath(QCoreApplication::applicationDirPath() + "/qml");
- engine.addImportPath(":/");
-
engine.load(url);
if (engine.rootObjects().isEmpty())