From f6ca497fe43b0f5e976f296e8a4d425516508e51 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Mon, 30 Aug 2021 15:46:39 +0200 Subject: Fix samegame example to use QML modules In this case it really makes no sense to use a shared directory because we want to show the progressive changes between the different versions. It's actually important to note that we're adding the pictures one by one. Therefore, the shared directory is dissolved and the pictures added duplicated into the respective versions of samegame. Furthermore, moving the code into a "content" directory is a bad idea because it complicates the import logic. We don't want to make the "content" directory its own QML module. We might move samegame.qml into the "content" directory, too, and apply some path wrangling to make it work, but it's really not worth it here. Change-Id: Ifc45f48832596377c21bc6ef55e918ef487bc94e Reviewed-by: Andrei Golubev Reviewed-by: Mitch Curtis Reviewed-by: Shawn Rutledge Reviewed-by: Fabian Kosmale (cherry picked from commit a3ea7a99381748c457336bfa8b9373070ebfa3ee) Reviewed-by: Qt Cherry-pick Bot --- examples/quick/tutorials/samegame/samegame4/samegame4.pro | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'examples/quick/tutorials/samegame/samegame4/samegame4.pro') diff --git a/examples/quick/tutorials/samegame/samegame4/samegame4.pro b/examples/quick/tutorials/samegame/samegame4/samegame4.pro index 5da0d46e19..e9d341d555 100644 --- a/examples/quick/tutorials/samegame/samegame4/samegame4.pro +++ b/examples/quick/tutorials/samegame/samegame4/samegame4.pro @@ -2,10 +2,7 @@ TEMPLATE = app QT += quick qml SOURCES += main.cpp - -RESOURCES += \ - samegame4.qrc \ - ../shared/pics/shared.qrc +RESOURCES += samegame4.qrc target.path = $$[QT_INSTALL_EXAMPLES]/quick/tutorials/samegame/samegame4 INSTALLS += target -- cgit v1.2.3