aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2022-05-31 15:00:45 +0200
committerUlf Hermann <ulf.hermann@qt.io>2022-06-24 08:45:43 +0200
commitd270c51f812b5f0ffe6208b38c8ea0e898535e50 (patch)
treef9f5e95f7cc0351925c2ed3f1dded34728787f62
parent12b0581a79f5fb866050628009878877af789e46 (diff)
Adapt examples to AUTO_RESOURCE_PREFIX
Examples that don't explicitly set NO_RESOURCE_TARGET_PATH get the AUTO_RESOURCE_PREFIX now. Task-number: QTBUG-103452 Change-Id: I6b41e96ce5620079f60ca2f967b0a2e611c1f738 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
-rw-r--r--examples/qml/dynamicscene/CMakeLists.txt1
-rw-r--r--examples/qml/dynamicscene/dynamicscene.qrc2
-rw-r--r--examples/qml/qmlextensionplugins/CMakeLists.txt1
-rw-r--r--examples/qml/xmlhttprequest/CMakeLists.txt1
-rw-r--r--examples/qml/xmlhttprequest/main.cpp2
-rw-r--r--examples/qml/xmlhttprequest/xmlhttprequest.qrc2
-rw-r--r--examples/quick/animation/CMakeLists.txt1
-rw-r--r--examples/quick/animation/animation.qrc2
-rw-r--r--examples/quick/canvas/CMakeLists.txt1
-rw-r--r--examples/quick/canvas/canvas.qrc2
-rw-r--r--examples/quick/customitems/dialcontrol/CMakeLists.txt1
-rw-r--r--examples/quick/customitems/dialcontrol/dialcontrol.qrc2
-rw-r--r--examples/quick/customitems/flipable/CMakeLists.txt1
-rw-r--r--examples/quick/customitems/flipable/flipable.qrc2
-rw-r--r--examples/quick/customitems/painteditem/CMakeLists.txt1
-rw-r--r--examples/quick/customitems/painteditem/TextBalloon/CMakeLists.txt1
-rw-r--r--examples/quick/customitems/painteditem/painteditem.qrc2
-rw-r--r--examples/quick/delegatechooser/CMakeLists.txt1
-rw-r--r--examples/quick/delegatechooser/qml.qrc2
-rw-r--r--examples/quick/draganddrop/CMakeLists.txt1
-rw-r--r--examples/quick/draganddrop/draganddrop.qrc2
-rw-r--r--examples/quick/embeddedinwidgets/CMakeLists.txt1
-rw-r--r--examples/quick/embeddedinwidgets/embeddedinwidgets.qrc2
-rw-r--r--examples/quick/externaldraganddrop/CMakeLists.txt1
-rw-r--r--examples/quick/externaldraganddrop/externaldraganddrop.qrc2
-rw-r--r--examples/quick/imageelements/CMakeLists.txt1
-rw-r--r--examples/quick/imageelements/imageelements.qrc2
-rw-r--r--examples/quick/imageprovider/CMakeLists.txt1
-rw-r--r--examples/quick/imageresponseprovider/CMakeLists.txt1
-rw-r--r--examples/quick/keyinteraction/CMakeLists.txt1
-rw-r--r--examples/quick/keyinteraction/keyinteraction.qrc2
-rw-r--r--examples/quick/layouts/CMakeLists.txt1
-rw-r--r--examples/quick/layouts/layouts.qrc2
-rw-r--r--examples/quick/localstorage/CMakeLists.txt1
-rw-r--r--examples/quick/localstorage/localstorage.qrc2
-rw-r--r--examples/quick/models/abstractitemmodel/CMakeLists.txt1
-rw-r--r--examples/quick/models/abstractitemmodel/abstractitemmodel.qrc2
-rw-r--r--examples/quick/models/abstractitemmodel/main.cpp2
-rw-r--r--examples/quick/models/objectlistmodel/CMakeLists.txt1
-rw-r--r--examples/quick/models/objectlistmodel/main.cpp2
-rw-r--r--examples/quick/models/objectlistmodel/objectlistmodel.qrc2
-rw-r--r--examples/quick/models/stringlistmodel/CMakeLists.txt1
-rw-r--r--examples/quick/models/stringlistmodel/main.cpp2
-rw-r--r--examples/quick/models/stringlistmodel/stringlistmodel.qrc2
-rw-r--r--examples/quick/mousearea/CMakeLists.txt1
-rw-r--r--examples/quick/mousearea/mousearea.qrc2
-rw-r--r--examples/quick/particles/affectors/CMakeLists.txt1
-rw-r--r--examples/quick/particles/affectors/affectors.qrc2
-rw-r--r--examples/quick/particles/emitters/CMakeLists.txt1
-rw-r--r--examples/quick/particles/emitters/emitters.qrc2
-rw-r--r--examples/quick/particles/imageparticle/CMakeLists.txt1
-rw-r--r--examples/quick/particles/imageparticle/imageparticle.qrc2
-rw-r--r--examples/quick/particles/itemparticle/CMakeLists.txt1
-rw-r--r--examples/quick/particles/itemparticle/itemparticle.qrc2
-rw-r--r--examples/quick/particles/system/CMakeLists.txt1
-rw-r--r--examples/quick/particles/system/system.qrc2
-rw-r--r--examples/quick/positioners/CMakeLists.txt1
-rw-r--r--examples/quick/positioners/positioners.qrc2
-rw-r--r--examples/quick/quick-accessibility/CMakeLists.txt1
-rw-r--r--examples/quick/quick-accessibility/accessibility.qrc2
-rw-r--r--examples/quick/rendercontrol/rendercontrol_d3d11/CMakeLists.txt1
-rw-r--r--examples/quick/rendercontrol/rendercontrol_d3d11/rendercontrol.qrc2
-rw-r--r--examples/quick/rendercontrol/rendercontrol_d3d11/window.cpp3
-rw-r--r--examples/quick/rendercontrol/rendercontrol_opengl/CMakeLists.txt1
-rw-r--r--examples/quick/rendercontrol/rendercontrol_opengl/rendercontrol.qrc2
-rw-r--r--examples/quick/rendercontrol/rendercontrol_opengl/window_singlethreaded.cpp2
-rw-r--r--examples/quick/righttoleft/CMakeLists.txt1
-rw-r--r--examples/quick/righttoleft/righttoleft.qrc2
-rw-r--r--examples/quick/shadereffects/CMakeLists.txt1
-rw-r--r--examples/quick/shadereffects/shadereffects.qrc2
-rw-r--r--examples/quick/shapes/CMakeLists.txt1
-rw-r--r--examples/quick/shapes/shapes.qrc2
-rw-r--r--examples/quick/shared/CMakeLists.txt1
-rw-r--r--examples/quick/shared/shared.h3
-rw-r--r--examples/quick/text/CMakeLists.txt1
-rw-r--r--examples/quick/text/text.qrc2
-rw-r--r--examples/quick/threading/CMakeLists.txt1
-rw-r--r--examples/quick/threading/threading.qrc2
-rw-r--r--examples/quick/touchinteraction/CMakeLists.txt1
-rw-r--r--examples/quick/touchinteraction/touchinteraction.qrc2
-rw-r--r--examples/quick/tutorials/dynamicview/dynamicview1/CMakeLists.txt1
-rw-r--r--examples/quick/tutorials/dynamicview/dynamicview1/dynamicview1.qrc2
-rw-r--r--examples/quick/tutorials/dynamicview/dynamicview2/CMakeLists.txt1
-rw-r--r--examples/quick/tutorials/dynamicview/dynamicview2/dynamicview2.qrc2
-rw-r--r--examples/quick/tutorials/dynamicview/dynamicview3/CMakeLists.txt1
-rw-r--r--examples/quick/tutorials/dynamicview/dynamicview3/dynamicview3.qrc2
-rw-r--r--examples/quick/tutorials/dynamicview/dynamicview4/CMakeLists.txt1
-rw-r--r--examples/quick/tutorials/dynamicview/dynamicview4/dynamicview4.qrc2
-rw-r--r--examples/quick/tutorials/samegame/samegame1/CMakeLists.txt1
-rw-r--r--examples/quick/tutorials/samegame/samegame1/samegame1.qrc2
-rw-r--r--examples/quick/tutorials/samegame/samegame2/CMakeLists.txt1
-rw-r--r--examples/quick/tutorials/samegame/samegame2/samegame2.qrc2
-rw-r--r--examples/quick/tutorials/samegame/samegame3/CMakeLists.txt1
-rw-r--r--examples/quick/tutorials/samegame/samegame3/samegame3.qrc2
-rw-r--r--examples/quick/tutorials/samegame/samegame4/CMakeLists.txt1
-rw-r--r--examples/quick/tutorials/samegame/samegame4/samegame4.qrc2
-rw-r--r--examples/quick/views/CMakeLists.txt1
-rw-r--r--examples/quick/views/views.qrc2
-rw-r--r--examples/quick/window/CMakeLists.txt1
-rw-r--r--examples/quick/window/main.cpp5
100 files changed, 101 insertions, 55 deletions
diff --git a/examples/qml/dynamicscene/CMakeLists.txt b/examples/qml/dynamicscene/CMakeLists.txt
index b76a096631..f860029bee 100644
--- a/examples/qml/dynamicscene/CMakeLists.txt
+++ b/examples/qml/dynamicscene/CMakeLists.txt
@@ -24,6 +24,7 @@ target_link_libraries(dynamicsceneexample PUBLIC
qt_add_qml_module(dynamicsceneexample
URI dynamicscene
VERSION 1.0
+ AUTO_RESOURCE_PREFIX
QML_FILES
"GenericSceneItem.qml"
"PaletteItem.qml"
diff --git a/examples/qml/dynamicscene/dynamicscene.qrc b/examples/qml/dynamicscene/dynamicscene.qrc
index 052b9f8536..f354fc469a 100644
--- a/examples/qml/dynamicscene/dynamicscene.qrc
+++ b/examples/qml/dynamicscene/dynamicscene.qrc
@@ -1,5 +1,5 @@
<RCC>
- <qresource prefix="/dynamicscene">
+ <qresource prefix="/qt/qml/dynamicscene">
<file>dynamicscene.qml</file>
<file>images/face-smile.png</file>
<file>images/moon.png</file>
diff --git a/examples/qml/qmlextensionplugins/CMakeLists.txt b/examples/qml/qmlextensionplugins/CMakeLists.txt
index 5910a544b8..2c9533ba42 100644
--- a/examples/qml/qmlextensionplugins/CMakeLists.txt
+++ b/examples/qml/qmlextensionplugins/CMakeLists.txt
@@ -35,6 +35,7 @@ qt_add_qml_module(qmlqtimeexample
VERSION 1.0
URI "TimeExample"
SOURCES timemodel.cpp timemodel.h
+ AUTO_RESOURCE_PREFIX
QML_FILES ${qml_files}
RESOURCES ${images}
)
diff --git a/examples/qml/xmlhttprequest/CMakeLists.txt b/examples/qml/xmlhttprequest/CMakeLists.txt
index 0c0f7df72d..c82debf377 100644
--- a/examples/qml/xmlhttprequest/CMakeLists.txt
+++ b/examples/qml/xmlhttprequest/CMakeLists.txt
@@ -20,6 +20,7 @@ qt_add_executable(xmlhttprequestexample
qt_add_qml_module(xmlhttprequestexample
URI xmlhttprequest
VERSION 1.0
+ AUTO_RESOURCE_PREFIX
QML_FILES
"methods.js"
"xmlhttprequest.qml"
diff --git a/examples/qml/xmlhttprequest/main.cpp b/examples/qml/xmlhttprequest/main.cpp
index c52f956509..f76ca49de5 100644
--- a/examples/qml/xmlhttprequest/main.cpp
+++ b/examples/qml/xmlhttprequest/main.cpp
@@ -17,7 +17,7 @@ int main(int argc, char *argv[])
qputenv("QML_XHR_ALLOW_FILE_READ", QByteArray("1"));
view.connect(view.engine(), &QQmlEngine::quit, &app, &QCoreApplication::quit);
- view.setSource(QUrl("qrc:///xmlhttprequest/xmlhttprequest.qml"));
+ view.setSource(QUrl("qrc:/qt/qml/xmlhttprequest/xmlhttprequest.qml"));
if (view.status() == QQuickView::Error)
return -1;
view.setResizeMode(QQuickView::SizeRootObjectToView);
diff --git a/examples/qml/xmlhttprequest/xmlhttprequest.qrc b/examples/qml/xmlhttprequest/xmlhttprequest.qrc
index 75c0edca8a..39d2a62393 100644
--- a/examples/qml/xmlhttprequest/xmlhttprequest.qrc
+++ b/examples/qml/xmlhttprequest/xmlhttprequest.qrc
@@ -1,5 +1,5 @@
<RCC>
- <qresource prefix="/xmlhttprequest">
+ <qresource prefix="/qt/qml/xmlhttprequest">
<file>xmlhttprequest.qml</file>
<file>methods.js</file>
<file>data.xml</file>
diff --git a/examples/quick/animation/CMakeLists.txt b/examples/quick/animation/CMakeLists.txt
index b052e85778..b2616fae4b 100644
--- a/examples/quick/animation/CMakeLists.txt
+++ b/examples/quick/animation/CMakeLists.txt
@@ -34,6 +34,7 @@ add_dependencies(animationexample animation_shared)
qt_add_qml_module(animationexample
URI animation
VERSION 1.0
+ AUTO_RESOURCE_PREFIX
QML_FILES
"animation.qml"
"basics/animators.qml"
diff --git a/examples/quick/animation/animation.qrc b/examples/quick/animation/animation.qrc
index 2d88c03007..3489d66d6e 100644
--- a/examples/quick/animation/animation.qrc
+++ b/examples/quick/animation/animation.qrc
@@ -1,5 +1,5 @@
<RCC>
- <qresource prefix="/animation">
+ <qresource prefix="/qt/qml/animation">
<file>animation.qml</file>
<file>basics/images/face-smile.png</file>
<file>basics/images/moon.png</file>
diff --git a/examples/quick/canvas/CMakeLists.txt b/examples/quick/canvas/CMakeLists.txt
index 4845cf5d82..24cd28f318 100644
--- a/examples/quick/canvas/CMakeLists.txt
+++ b/examples/quick/canvas/CMakeLists.txt
@@ -32,6 +32,7 @@ target_link_libraries(canvasexample PUBLIC
qt_add_qml_module(canvasexample
URI canvas
VERSION 1.0
+ AUTO_RESOURCE_PREFIX
QML_FILES
"LabeledSlider.qml"
"bezierCurve/bezierCurve.qml"
diff --git a/examples/quick/canvas/canvas.qrc b/examples/quick/canvas/canvas.qrc
index 7904309811..eb7b3ad6d6 100644
--- a/examples/quick/canvas/canvas.qrc
+++ b/examples/quick/canvas/canvas.qrc
@@ -1,5 +1,5 @@
<RCC>
- <qresource prefix="/canvas">
+ <qresource prefix="/qt/qml/canvas">
<file>canvas.qml</file>
<file>LabeledSlider.qml</file>
<file>bezierCurve/bezierCurve.qml</file>
diff --git a/examples/quick/customitems/dialcontrol/CMakeLists.txt b/examples/quick/customitems/dialcontrol/CMakeLists.txt
index fbc08e0d63..4ee28295ea 100644
--- a/examples/quick/customitems/dialcontrol/CMakeLists.txt
+++ b/examples/quick/customitems/dialcontrol/CMakeLists.txt
@@ -30,6 +30,7 @@ target_link_libraries(dialcontrolexample PUBLIC
qt_add_qml_module(dialcontrolexample
URI dialcontrol
VERSION 1.0
+ AUTO_RESOURCE_PREFIX
QML_FILES
"Dial.qml"
"QuitButton.qml"
diff --git a/examples/quick/customitems/dialcontrol/dialcontrol.qrc b/examples/quick/customitems/dialcontrol/dialcontrol.qrc
index 9b9bd42f23..c3c8d58b66 100644
--- a/examples/quick/customitems/dialcontrol/dialcontrol.qrc
+++ b/examples/quick/customitems/dialcontrol/dialcontrol.qrc
@@ -1,5 +1,5 @@
<RCC>
- <qresource prefix="/dialcontrol">
+ <qresource prefix="/qt/qml/dialcontrol">
<file>Dial.qml</file>
<file>QuitButton.qml</file>
<file>background.png</file>
diff --git a/examples/quick/customitems/flipable/CMakeLists.txt b/examples/quick/customitems/flipable/CMakeLists.txt
index f9b56f201b..a3eb3d2321 100644
--- a/examples/quick/customitems/flipable/CMakeLists.txt
+++ b/examples/quick/customitems/flipable/CMakeLists.txt
@@ -28,6 +28,7 @@ target_link_libraries(flipableexample PUBLIC
qt_add_qml_module(flipableexample
URI flipable
VERSION 1.0
+ AUTO_RESOURCE_PREFIX
QML_FILES
"flipable.qml"
"Card.qml"
diff --git a/examples/quick/customitems/flipable/flipable.qrc b/examples/quick/customitems/flipable/flipable.qrc
index b7bc2f3021..a8056e45f9 100644
--- a/examples/quick/customitems/flipable/flipable.qrc
+++ b/examples/quick/customitems/flipable/flipable.qrc
@@ -1,5 +1,5 @@
<RCC>
- <qresource prefix="/flipable">
+ <qresource prefix="/qt/qml/flipable">
<file>flipable.qml</file>
<file>5_heart.png</file>
<file>9_club.png</file>
diff --git a/examples/quick/customitems/painteditem/CMakeLists.txt b/examples/quick/customitems/painteditem/CMakeLists.txt
index d7903b4d15..081425d3fd 100644
--- a/examples/quick/customitems/painteditem/CMakeLists.txt
+++ b/examples/quick/customitems/painteditem/CMakeLists.txt
@@ -19,6 +19,7 @@ qt_add_executable(painteditemexample WIN32 MACOSX_BUNDLE main.cpp)
qt_add_qml_module(painteditemexample
URI painteditem
VERSION 1.0
+ AUTO_RESOURCE_PREFIX
QML_FILES
"textballoons.qml"
)
diff --git a/examples/quick/customitems/painteditem/TextBalloon/CMakeLists.txt b/examples/quick/customitems/painteditem/TextBalloon/CMakeLists.txt
index fb2bf7568e..20d7e99294 100644
--- a/examples/quick/customitems/painteditem/TextBalloon/CMakeLists.txt
+++ b/examples/quick/customitems/painteditem/TextBalloon/CMakeLists.txt
@@ -8,6 +8,7 @@ qt_add_qml_module(qmltextballoon
VERSION 1.0
URI "TextBalloon"
PLUGIN_TARGET qmltextballoon
+ AUTO_RESOURCE_PREFIX
SOURCES
textballoon.cpp textballoon.h
)
diff --git a/examples/quick/customitems/painteditem/painteditem.qrc b/examples/quick/customitems/painteditem/painteditem.qrc
index d436ab32e2..95305efaca 100644
--- a/examples/quick/customitems/painteditem/painteditem.qrc
+++ b/examples/quick/customitems/painteditem/painteditem.qrc
@@ -1,5 +1,5 @@
<RCC>
- <qresource prefix="/painteditem">
+ <qresource prefix="/qt/qml/painteditem">
<file>textballoons.qml</file>
</qresource>
</RCC>
diff --git a/examples/quick/delegatechooser/CMakeLists.txt b/examples/quick/delegatechooser/CMakeLists.txt
index 3b111119d3..ac664a0f9b 100644
--- a/examples/quick/delegatechooser/CMakeLists.txt
+++ b/examples/quick/delegatechooser/CMakeLists.txt
@@ -27,6 +27,7 @@ add_dependencies(delegatechooserexample delegatechooser_shared)
qt_add_qml_module(delegatechooserexample
URI delegatechooser
VERSION 1.0
+ AUTO_RESOURCE_PREFIX
QML_FILES
"delegatechooser.qml"
)
diff --git a/examples/quick/delegatechooser/qml.qrc b/examples/quick/delegatechooser/qml.qrc
index abd2efbdda..6128befab3 100644
--- a/examples/quick/delegatechooser/qml.qrc
+++ b/examples/quick/delegatechooser/qml.qrc
@@ -1,5 +1,5 @@
<RCC>
- <qresource prefix="/delegatechooser">
+ <qresource prefix="/qt/qml/delegatechooser">
<file>delegatechooser.qml</file>
</qresource>
</RCC>
diff --git a/examples/quick/draganddrop/CMakeLists.txt b/examples/quick/draganddrop/CMakeLists.txt
index a969e420e5..2d077e8563 100644
--- a/examples/quick/draganddrop/CMakeLists.txt
+++ b/examples/quick/draganddrop/CMakeLists.txt
@@ -22,6 +22,7 @@ qt_add_executable(draganddropexample
qt_add_qml_module(draganddropexample
URI draganddrop
VERSION 1.0
+ AUTO_RESOURCE_PREFIX
QML_FILES
"draganddrop.qml"
"tiles/DragTile.qml"
diff --git a/examples/quick/draganddrop/draganddrop.qrc b/examples/quick/draganddrop/draganddrop.qrc
index df9fec51d2..a710562b79 100644
--- a/examples/quick/draganddrop/draganddrop.qrc
+++ b/examples/quick/draganddrop/draganddrop.qrc
@@ -1,5 +1,5 @@
<RCC>
- <qresource prefix="/draganddrop">
+ <qresource prefix="/qt/qml/draganddrop">
<file>draganddrop.qml</file>
<file>tiles/DragTile.qml</file>
<file>tiles/DropTile.qml</file>
diff --git a/examples/quick/embeddedinwidgets/CMakeLists.txt b/examples/quick/embeddedinwidgets/CMakeLists.txt
index aedc1f8fc0..61af6a3244 100644
--- a/examples/quick/embeddedinwidgets/CMakeLists.txt
+++ b/examples/quick/embeddedinwidgets/CMakeLists.txt
@@ -26,6 +26,7 @@ target_link_libraries(embeddedinwidgetsexample PRIVATE
qt_add_qml_module(embeddedinwidgetsexample
URI embeddedinwidgets
VERSION 1.0
+ AUTO_RESOURCE_PREFIX
QML_FILES
"main.qml"
RESOURCES
diff --git a/examples/quick/embeddedinwidgets/embeddedinwidgets.qrc b/examples/quick/embeddedinwidgets/embeddedinwidgets.qrc
index 9fc33601d0..40a959932a 100644
--- a/examples/quick/embeddedinwidgets/embeddedinwidgets.qrc
+++ b/examples/quick/embeddedinwidgets/embeddedinwidgets.qrc
@@ -1,5 +1,5 @@
<RCC>
- <qresource prefix="/embeddedinwidgets">
+ <qresource prefix="/qt/qml/embeddedinwidgets">
<file>main.qml</file>
<file>reflect.frag.qsb</file>
</qresource>
diff --git a/examples/quick/externaldraganddrop/CMakeLists.txt b/examples/quick/externaldraganddrop/CMakeLists.txt
index 08dd0276a0..6999a3bc65 100644
--- a/examples/quick/externaldraganddrop/CMakeLists.txt
+++ b/examples/quick/externaldraganddrop/CMakeLists.txt
@@ -23,6 +23,7 @@ set_target_properties(externaldraganddropexample PROPERTIES
qt_add_qml_module(externaldraganddropexample
URI externaldraganddrop
VERSION 1.0
+ AUTO_RESOURCE_PREFIX
QML_FILES
"DragAndDropTextItem.qml"
"externaldraganddrop.qml"
diff --git a/examples/quick/externaldraganddrop/externaldraganddrop.qrc b/examples/quick/externaldraganddrop/externaldraganddrop.qrc
index edac9820c9..94f7e47e24 100644
--- a/examples/quick/externaldraganddrop/externaldraganddrop.qrc
+++ b/examples/quick/externaldraganddrop/externaldraganddrop.qrc
@@ -1,5 +1,5 @@
<RCC>
- <qresource prefix="/externaldraganddrop">
+ <qresource prefix="/qt/qml/externaldraganddrop">
<file>externaldraganddrop.qml</file>
<file>DragAndDropTextItem.qml</file>
</qresource>
diff --git a/examples/quick/imageelements/CMakeLists.txt b/examples/quick/imageelements/CMakeLists.txt
index 8e065a9a3e..6ca893b47f 100644
--- a/examples/quick/imageelements/CMakeLists.txt
+++ b/examples/quick/imageelements/CMakeLists.txt
@@ -29,6 +29,7 @@ target_link_libraries(imageelementsexample PUBLIC
qt_add_qml_module(imageelementsexample
URI imageelements
VERSION 1.0
+ AUTO_RESOURCE_PREFIX
QML_FILES
"animatedimage.qml"
"animatedsprite.qml"
diff --git a/examples/quick/imageelements/imageelements.qrc b/examples/quick/imageelements/imageelements.qrc
index 62f2bbfc76..75cd996074 100644
--- a/examples/quick/imageelements/imageelements.qrc
+++ b/examples/quick/imageelements/imageelements.qrc
@@ -1,5 +1,5 @@
<RCC>
- <qresource prefix="/imageelements">
+ <qresource prefix="/qt/qml/imageelements">
<file>animatedimage.qml</file>
<file>animatedsprite.qml</file>
<file>borderimage.qml</file>
diff --git a/examples/quick/imageprovider/CMakeLists.txt b/examples/quick/imageprovider/CMakeLists.txt
index 950ec3f52b..1bfc59e14a 100644
--- a/examples/quick/imageprovider/CMakeLists.txt
+++ b/examples/quick/imageprovider/CMakeLists.txt
@@ -15,6 +15,7 @@ find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick)
qt6_add_qml_module(qmlimageproviderplugin
VERSION 1.0
URI "ImageProviderCore"
+ AUTO_RESOURCE_PREFIX
PLUGIN_TARGET qmlimageproviderplugin
NO_PLUGIN_OPTIONAL
NO_GENERATE_PLUGIN_SOURCE
diff --git a/examples/quick/imageresponseprovider/CMakeLists.txt b/examples/quick/imageresponseprovider/CMakeLists.txt
index af8fed133d..21de71609f 100644
--- a/examples/quick/imageresponseprovider/CMakeLists.txt
+++ b/examples/quick/imageresponseprovider/CMakeLists.txt
@@ -15,6 +15,7 @@ find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick)
qt6_add_qml_module(qmlimageresponseproviderplugin
VERSION 1.0
URI "ImageResponseProviderCore"
+ AUTO_RESOURCE_PREFIX
PLUGIN_TARGET qmlimageresponseproviderplugin
NO_PLUGIN_OPTIONAL
NO_GENERATE_PLUGIN_SOURCE
diff --git a/examples/quick/keyinteraction/CMakeLists.txt b/examples/quick/keyinteraction/CMakeLists.txt
index 24a1637547..3307672fff 100644
--- a/examples/quick/keyinteraction/CMakeLists.txt
+++ b/examples/quick/keyinteraction/CMakeLists.txt
@@ -26,6 +26,7 @@ target_link_libraries(keyinteractionexample PRIVATE
qt_add_qml_module(keyinteractionexample
URI keyinteraction
VERSION 1.0
+ AUTO_RESOURCE_PREFIX
QML_FILES
"ContextMenu.qml"
"GridMenu.qml"
diff --git a/examples/quick/keyinteraction/keyinteraction.qrc b/examples/quick/keyinteraction/keyinteraction.qrc
index 8738ef9826..3193e39083 100644
--- a/examples/quick/keyinteraction/keyinteraction.qrc
+++ b/examples/quick/keyinteraction/keyinteraction.qrc
@@ -1,5 +1,5 @@
<RCC>
- <qresource prefix="/keyinteraction">
+ <qresource prefix="/qt/qml/keyinteraction">
<file>keyinteraction.qml</file>
<file>focus.qml</file>
<file>ContextMenu.qml</file>
diff --git a/examples/quick/layouts/CMakeLists.txt b/examples/quick/layouts/CMakeLists.txt
index 143784dc82..2ad7c9f497 100644
--- a/examples/quick/layouts/CMakeLists.txt
+++ b/examples/quick/layouts/CMakeLists.txt
@@ -20,6 +20,7 @@ qt_add_executable(layoutsexample
qt_add_qml_module(layoutsexample
URI layouts
VERSION 1.0
+ AUTO_RESOURCE_PREFIX
QML_FILES
"layouts.qml"
)
diff --git a/examples/quick/layouts/layouts.qrc b/examples/quick/layouts/layouts.qrc
index 1e01c43fe1..eddf00069e 100644
--- a/examples/quick/layouts/layouts.qrc
+++ b/examples/quick/layouts/layouts.qrc
@@ -1,5 +1,5 @@
<!DOCTYPE RCC><RCC version="1.0">
-<qresource prefix="/layouts">
+<qresource prefix="/qt/qml/layouts">
<file>layouts.qml</file>
</qresource>
</RCC>
diff --git a/examples/quick/localstorage/CMakeLists.txt b/examples/quick/localstorage/CMakeLists.txt
index cf453d8889..144dfab4b4 100644
--- a/examples/quick/localstorage/CMakeLists.txt
+++ b/examples/quick/localstorage/CMakeLists.txt
@@ -20,6 +20,7 @@ qt_add_executable(localstorageexample
qt_add_qml_module(localstorageexample
URI localstorage
VERSION 1.0
+ AUTO_RESOURCE_PREFIX
QML_FILES
"Database.js"
"Header.qml"
diff --git a/examples/quick/localstorage/localstorage.qrc b/examples/quick/localstorage/localstorage.qrc
index 62c72daa9f..3950613c7a 100644
--- a/examples/quick/localstorage/localstorage.qrc
+++ b/examples/quick/localstorage/localstorage.qrc
@@ -1,5 +1,5 @@
<RCC>
- <qresource prefix="/localstorage">
+ <qresource prefix="/qt/qml/localstorage">
<file>Header.qml</file>
<file>Database.js</file>
<file>MyModel.qml</file>
diff --git a/examples/quick/models/abstractitemmodel/CMakeLists.txt b/examples/quick/models/abstractitemmodel/CMakeLists.txt
index 95985ec8b9..6a76513ee6 100644
--- a/examples/quick/models/abstractitemmodel/CMakeLists.txt
+++ b/examples/quick/models/abstractitemmodel/CMakeLists.txt
@@ -27,6 +27,7 @@ target_link_libraries(abstractitemmodelexample PUBLIC
qt_add_qml_module(abstractitemmodelexample
URI abstractitemmodel
VERSION 1.0
+ AUTO_RESOURCE_PREFIX
QML_FILES
"view.qml"
)
diff --git a/examples/quick/models/abstractitemmodel/abstractitemmodel.qrc b/examples/quick/models/abstractitemmodel/abstractitemmodel.qrc
index ad8c2df8ae..bef1041008 100644
--- a/examples/quick/models/abstractitemmodel/abstractitemmodel.qrc
+++ b/examples/quick/models/abstractitemmodel/abstractitemmodel.qrc
@@ -1,5 +1,5 @@
<!DOCTYPE RCC><RCC version="1.0">
-<qresource prefix="/abstractitemmodel">
+<qresource prefix="/qt/qml/abstractitemmodel">
<file>view.qml</file>
</qresource>
</RCC>
diff --git a/examples/quick/models/abstractitemmodel/main.cpp b/examples/quick/models/abstractitemmodel/main.cpp
index 4bce5c00a0..a391b5ce67 100644
--- a/examples/quick/models/abstractitemmodel/main.cpp
+++ b/examples/quick/models/abstractitemmodel/main.cpp
@@ -23,7 +23,7 @@ int main(int argc, char ** argv)
view.setResizeMode(QQuickView::SizeRootObjectToView);
view.setInitialProperties({{"model", QVariant::fromValue(&model)}});
//![0]
- view.setSource(QUrl("qrc:/abstractitemmodel/view.qml"));
+ view.setSource(QUrl("qrc:/qt/qml/abstractitemmodel/view.qml"));
view.show();
return app.exec();
diff --git a/examples/quick/models/objectlistmodel/CMakeLists.txt b/examples/quick/models/objectlistmodel/CMakeLists.txt
index 3210c3646c..724c3a475f 100644
--- a/examples/quick/models/objectlistmodel/CMakeLists.txt
+++ b/examples/quick/models/objectlistmodel/CMakeLists.txt
@@ -27,6 +27,7 @@ target_link_libraries(objectlistmodelexample PUBLIC
qt_add_qml_module(objectlistmodelexample
URI objectlistmodel
VERSION 1.0
+ AUTO_RESOURCE_PREFIX
QML_FILES
"view.qml"
)
diff --git a/examples/quick/models/objectlistmodel/main.cpp b/examples/quick/models/objectlistmodel/main.cpp
index da1d71f765..584e091431 100644
--- a/examples/quick/models/objectlistmodel/main.cpp
+++ b/examples/quick/models/objectlistmodel/main.cpp
@@ -50,7 +50,7 @@ int main(int argc, char ** argv)
view.setInitialProperties({{ "model", QVariant::fromValue(dataList) }});
//![0]
- view.setSource(QUrl("qrc:/objectlistmodel/view.qml"));
+ view.setSource(QUrl("qrc:/qt/qml/objectlistmodel/view.qml"));
view.show();
return app.exec();
diff --git a/examples/quick/models/objectlistmodel/objectlistmodel.qrc b/examples/quick/models/objectlistmodel/objectlistmodel.qrc
index a6e8cffb08..7552b9e751 100644
--- a/examples/quick/models/objectlistmodel/objectlistmodel.qrc
+++ b/examples/quick/models/objectlistmodel/objectlistmodel.qrc
@@ -1,5 +1,5 @@
<!DOCTYPE RCC><RCC version="1.0">
-<qresource prefix="/objectlistmodel">
+<qresource prefix="/qt/qml/objectlistmodel">
<file>view.qml</file>
</qresource>
</RCC>
diff --git a/examples/quick/models/stringlistmodel/CMakeLists.txt b/examples/quick/models/stringlistmodel/CMakeLists.txt
index 1f72cf3b07..2a627b751e 100644
--- a/examples/quick/models/stringlistmodel/CMakeLists.txt
+++ b/examples/quick/models/stringlistmodel/CMakeLists.txt
@@ -26,6 +26,7 @@ target_link_libraries(stringlistmodelexample PUBLIC
qt_add_qml_module(stringlistmodelexample
URI stringlistmodel
VERSION 1.0
+ AUTO_RESOURCE_PREFIX
QML_FILES
"view.qml"
)
diff --git a/examples/quick/models/stringlistmodel/main.cpp b/examples/quick/models/stringlistmodel/main.cpp
index 84291a921e..2f2d4b223d 100644
--- a/examples/quick/models/stringlistmodel/main.cpp
+++ b/examples/quick/models/stringlistmodel/main.cpp
@@ -32,7 +32,7 @@ int main(int argc, char ** argv)
view.setInitialProperties({{ "model", QVariant::fromValue(dataList) }});
//![0]
- view.setSource(QUrl("qrc:/stringlistmodel/view.qml"));
+ view.setSource(QUrl("qrc:/qt/qml/stringlistmodel/view.qml"));
view.show();
return app.exec();
diff --git a/examples/quick/models/stringlistmodel/stringlistmodel.qrc b/examples/quick/models/stringlistmodel/stringlistmodel.qrc
index 31928f0738..fa7c643b44 100644
--- a/examples/quick/models/stringlistmodel/stringlistmodel.qrc
+++ b/examples/quick/models/stringlistmodel/stringlistmodel.qrc
@@ -1,5 +1,5 @@
<!DOCTYPE RCC><RCC version="1.0">
-<qresource prefix="/stringlistmodel">
+<qresource prefix="/qt/qml/stringlistmodel">
<file>view.qml</file>
</qresource>
</RCC>
diff --git a/examples/quick/mousearea/CMakeLists.txt b/examples/quick/mousearea/CMakeLists.txt
index da36fd61ca..8a1b34c5f1 100644
--- a/examples/quick/mousearea/CMakeLists.txt
+++ b/examples/quick/mousearea/CMakeLists.txt
@@ -26,6 +26,7 @@ target_link_libraries(mouseareaexample PUBLIC
qt_add_qml_module(mouseareaexample
URI mousearea
VERSION 1.0
+ AUTO_RESOURCE_PREFIX
QML_FILES
"mousearea-wheel-example.qml"
"mousearea.qml"
diff --git a/examples/quick/mousearea/mousearea.qrc b/examples/quick/mousearea/mousearea.qrc
index 23d30aa37c..7c6545b56d 100644
--- a/examples/quick/mousearea/mousearea.qrc
+++ b/examples/quick/mousearea/mousearea.qrc
@@ -1,5 +1,5 @@
<RCC>
- <qresource prefix="/mousearea">
+ <qresource prefix="/qt/qml/mousearea">
<file>mousearea.qml</file>
<file>mousearea-wheel-example.qml</file>
</qresource>
diff --git a/examples/quick/particles/affectors/CMakeLists.txt b/examples/quick/particles/affectors/CMakeLists.txt
index afbf286112..c39cfc0b1d 100644
--- a/examples/quick/particles/affectors/CMakeLists.txt
+++ b/examples/quick/particles/affectors/CMakeLists.txt
@@ -30,6 +30,7 @@ add_dependencies(affectorsexample affectors_shared)
qt_add_qml_module(affectorsexample
URI affectors
VERSION 1.0
+ AUTO_RESOURCE_PREFIX
QML_FILES
"affectors.qml"
"GreyButton.qml"
diff --git a/examples/quick/particles/affectors/affectors.qrc b/examples/quick/particles/affectors/affectors.qrc
index e26bf0b173..a826d351a8 100644
--- a/examples/quick/particles/affectors/affectors.qrc
+++ b/examples/quick/particles/affectors/affectors.qrc
@@ -1,5 +1,5 @@
<RCC>
- <qresource prefix="/affectors">
+ <qresource prefix="/qt/qml/affectors">
<file>affectors.qml</file>
<file>age.qml</file>
<file>attractor.qml</file>
diff --git a/examples/quick/particles/emitters/CMakeLists.txt b/examples/quick/particles/emitters/CMakeLists.txt
index 1203de6b59..f85713ee97 100644
--- a/examples/quick/particles/emitters/CMakeLists.txt
+++ b/examples/quick/particles/emitters/CMakeLists.txt
@@ -30,6 +30,7 @@ add_dependencies(emittersexample emitters_shared)
qt_add_qml_module(emittersexample
URI emitters
VERSION 1.0
+ AUTO_RESOURCE_PREFIX
QML_FILES
"burstandpulse.qml"
"customemitter.qml"
diff --git a/examples/quick/particles/emitters/emitters.qrc b/examples/quick/particles/emitters/emitters.qrc
index 5eaf30cb04..5f3217d8a5 100644
--- a/examples/quick/particles/emitters/emitters.qrc
+++ b/examples/quick/particles/emitters/emitters.qrc
@@ -1,5 +1,5 @@
<RCC>
- <qresource prefix="/emitters">
+ <qresource prefix="/qt/qml/emitters">
<file>emitters.qml</file>
<file>burstandpulse.qml</file>
<file>customemitter.qml</file>
diff --git a/examples/quick/particles/imageparticle/CMakeLists.txt b/examples/quick/particles/imageparticle/CMakeLists.txt
index 41eab03f36..43b84a723c 100644
--- a/examples/quick/particles/imageparticle/CMakeLists.txt
+++ b/examples/quick/particles/imageparticle/CMakeLists.txt
@@ -30,6 +30,7 @@ add_dependencies(imageparticleexample imageparticle_shared)
qt_add_qml_module(imageparticleexample
URI imageparticle
VERSION 1.0
+ AUTO_RESOURCE_PREFIX
QML_FILES
"allatonce.qml"
"colored.qml"
diff --git a/examples/quick/particles/imageparticle/imageparticle.qrc b/examples/quick/particles/imageparticle/imageparticle.qrc
index ef9bddaaae..f77a5ac411 100644
--- a/examples/quick/particles/imageparticle/imageparticle.qrc
+++ b/examples/quick/particles/imageparticle/imageparticle.qrc
@@ -1,5 +1,5 @@
<RCC>
- <qresource prefix="/imageparticle">
+ <qresource prefix="/qt/qml/imageparticle">
<file>imageparticle.qml</file>
<file>allatonce.qml</file>
<file>colored.qml</file>
diff --git a/examples/quick/particles/itemparticle/CMakeLists.txt b/examples/quick/particles/itemparticle/CMakeLists.txt
index be5fa2fc03..0c50cd72f6 100644
--- a/examples/quick/particles/itemparticle/CMakeLists.txt
+++ b/examples/quick/particles/itemparticle/CMakeLists.txt
@@ -30,6 +30,7 @@ add_dependencies(itemparticleexample itemparticle_shared)
qt_add_qml_module(itemparticleexample
URI itemparticle
VERSION 1.0
+ AUTO_RESOURCE_PREFIX
QML_FILES
"itemparticle.qml"
"delegates.qml"
diff --git a/examples/quick/particles/itemparticle/itemparticle.qrc b/examples/quick/particles/itemparticle/itemparticle.qrc
index f951ba6366..d345d2a957 100644
--- a/examples/quick/particles/itemparticle/itemparticle.qrc
+++ b/examples/quick/particles/itemparticle/itemparticle.qrc
@@ -1,5 +1,5 @@
<RCC>
- <qresource prefix="/itemparticle">
+ <qresource prefix="/qt/qml/itemparticle">
<file>itemparticle.qml</file>
<file>delegates.qml</file>
<file>script.js</file>
diff --git a/examples/quick/particles/system/CMakeLists.txt b/examples/quick/particles/system/CMakeLists.txt
index f6c975a128..b5c96a605e 100644
--- a/examples/quick/particles/system/CMakeLists.txt
+++ b/examples/quick/particles/system/CMakeLists.txt
@@ -30,6 +30,7 @@ add_dependencies(systemexample system_shared)
qt_add_qml_module(systemexample
URI system
VERSION 1.0
+ AUTO_RESOURCE_PREFIX
QML_FILES
"dynamiccomparison.qml"
"dynamicemitters.qml"
diff --git a/examples/quick/particles/system/system.qrc b/examples/quick/particles/system/system.qrc
index e86bc19e68..806f11e818 100644
--- a/examples/quick/particles/system/system.qrc
+++ b/examples/quick/particles/system/system.qrc
@@ -1,5 +1,5 @@
<RCC>
- <qresource prefix="/system">
+ <qresource prefix="/qt/qml/system">
<file>system.qml</file>
<file>dynamiccomparison.qml</file>
<file>dynamicemitters.qml</file>
diff --git a/examples/quick/positioners/CMakeLists.txt b/examples/quick/positioners/CMakeLists.txt
index dd2ebca075..bf9b2da220 100644
--- a/examples/quick/positioners/CMakeLists.txt
+++ b/examples/quick/positioners/CMakeLists.txt
@@ -22,6 +22,7 @@ qt_add_executable(positionersexample
qt_add_qml_module(positionersexample
URI positioners
VERSION 1.0
+ AUTO_RESOURCE_PREFIX
QML_FILES
"positioners-attachedproperties.qml"
"positioners-transitions.qml"
diff --git a/examples/quick/positioners/positioners.qrc b/examples/quick/positioners/positioners.qrc
index 7025a6f8d8..22b29868e5 100644
--- a/examples/quick/positioners/positioners.qrc
+++ b/examples/quick/positioners/positioners.qrc
@@ -1,5 +1,5 @@
<RCC>
- <qresource prefix="/positioners">
+ <qresource prefix="/qt/qml/positioners">
<file>positioners.qml</file>
<file>positioners-attachedproperties.qml</file>
<file>positioners-transitions.qml</file>
diff --git a/examples/quick/quick-accessibility/CMakeLists.txt b/examples/quick/quick-accessibility/CMakeLists.txt
index b53a04e8e7..a252265ada 100644
--- a/examples/quick/quick-accessibility/CMakeLists.txt
+++ b/examples/quick/quick-accessibility/CMakeLists.txt
@@ -30,6 +30,7 @@ target_link_libraries(quick-accessibility PUBLIC
qt_add_qml_module(quick-accessibility
URI accessibility
VERSION 1.0
+ AUTO_RESOURCE_PREFIX
QML_FILES
"accessibility.qml"
"Button.qml"
diff --git a/examples/quick/quick-accessibility/accessibility.qrc b/examples/quick/quick-accessibility/accessibility.qrc
index f106d551c8..a1d86bd1bc 100644
--- a/examples/quick/quick-accessibility/accessibility.qrc
+++ b/examples/quick/quick-accessibility/accessibility.qrc
@@ -1,5 +1,5 @@
<RCC>
- <qresource prefix="/accessibility">
+ <qresource prefix="/qt/qml/accessibility">
<file>accessibility.qml</file>
<file>Button.qml</file>
<file>Checkbox.qml</file>
diff --git a/examples/quick/rendercontrol/rendercontrol_d3d11/CMakeLists.txt b/examples/quick/rendercontrol/rendercontrol_d3d11/CMakeLists.txt
index b01a0a7306..df97f1ffc3 100644
--- a/examples/quick/rendercontrol/rendercontrol_d3d11/CMakeLists.txt
+++ b/examples/quick/rendercontrol/rendercontrol_d3d11/CMakeLists.txt
@@ -31,6 +31,7 @@ target_link_libraries(rendercontrol_d3d11example PUBLIC
# Resources:
qt_add_qml_module(rendercontrol_d3d11example
URI rendercontrol
+ AUTO_RESOURCE_PREFIX
VERSION 1.0
QML_FILES
"demo.qml"
diff --git a/examples/quick/rendercontrol/rendercontrol_d3d11/rendercontrol.qrc b/examples/quick/rendercontrol/rendercontrol_d3d11/rendercontrol.qrc
index 2246eeb842..9a410038a5 100644
--- a/examples/quick/rendercontrol/rendercontrol_d3d11/rendercontrol.qrc
+++ b/examples/quick/rendercontrol/rendercontrol_d3d11/rendercontrol.qrc
@@ -1,5 +1,5 @@
<RCC>
- <qresource prefix="/rendercontrol">
+ <qresource prefix="/qt/qml/rendercontrol">
<file>demo.qml</file>
</qresource>
</RCC>
diff --git a/examples/quick/rendercontrol/rendercontrol_d3d11/window.cpp b/examples/quick/rendercontrol/rendercontrol_d3d11/window.cpp
index 8fa788977e..aae020dc56 100644
--- a/examples/quick/rendercontrol/rendercontrol_d3d11/window.cpp
+++ b/examples/quick/rendercontrol/rendercontrol_d3d11/window.cpp
@@ -71,7 +71,8 @@ Window::Window(Engine *engine)
m_quickWindow = new QQuickWindow(m_renderControl);
m_qmlEngine = new QQmlEngine;
- m_qmlComponent = new QQmlComponent(m_qmlEngine, QUrl(QLatin1String("qrc:/rendercontrol/demo.qml")));
+ m_qmlComponent = new QQmlComponent(
+ m_qmlEngine, QUrl(QLatin1String("qrc:/qt/qtml/rendercontrol/demo.qml")));
if (m_qmlComponent->isError()) {
for (const QQmlError &error : m_qmlComponent->errors())
qWarning() << error.url() << error.line() << error;
diff --git a/examples/quick/rendercontrol/rendercontrol_opengl/CMakeLists.txt b/examples/quick/rendercontrol/rendercontrol_opengl/CMakeLists.txt
index ed67f738ce..17c337c818 100644
--- a/examples/quick/rendercontrol/rendercontrol_opengl/CMakeLists.txt
+++ b/examples/quick/rendercontrol/rendercontrol_opengl/CMakeLists.txt
@@ -29,6 +29,7 @@ target_link_libraries(rendercontrol_openglexample PUBLIC
qt_add_qml_module(rendercontrol_openglexample
URI rendercontrol
VERSION 1.0
+ AUTO_RESOURCE_PREFIX
QML_FILES
"demo.qml"
)
diff --git a/examples/quick/rendercontrol/rendercontrol_opengl/rendercontrol.qrc b/examples/quick/rendercontrol/rendercontrol_opengl/rendercontrol.qrc
index 2246eeb842..9a410038a5 100644
--- a/examples/quick/rendercontrol/rendercontrol_opengl/rendercontrol.qrc
+++ b/examples/quick/rendercontrol/rendercontrol_opengl/rendercontrol.qrc
@@ -1,5 +1,5 @@
<RCC>
- <qresource prefix="/rendercontrol">
+ <qresource prefix="/qt/qml/rendercontrol">
<file>demo.qml</file>
</qresource>
</RCC>
diff --git a/examples/quick/rendercontrol/rendercontrol_opengl/window_singlethreaded.cpp b/examples/quick/rendercontrol/rendercontrol_opengl/window_singlethreaded.cpp
index 0d26bae8f1..6b8e1d9077 100644
--- a/examples/quick/rendercontrol/rendercontrol_opengl/window_singlethreaded.cpp
+++ b/examples/quick/rendercontrol/rendercontrol_opengl/window_singlethreaded.cpp
@@ -241,7 +241,7 @@ void WindowSingleThreaded::exposeEvent(QExposeEvent *)
if (isExposed()) {
if (!m_quickInitialized) {
m_cubeRenderer->render(this, m_context, m_quickReady ? m_textureId : 0);
- startQuick(QStringLiteral("qrc:/rendercontrol/demo.qml"));
+ startQuick(QStringLiteral("qrc:/qt/qml/rendercontrol/demo.qml"));
}
}
}
diff --git a/examples/quick/righttoleft/CMakeLists.txt b/examples/quick/righttoleft/CMakeLists.txt
index fda360f67b..3920cd7745 100644
--- a/examples/quick/righttoleft/CMakeLists.txt
+++ b/examples/quick/righttoleft/CMakeLists.txt
@@ -22,6 +22,7 @@ qt_add_executable(righttoleftexample
qt_add_qml_module(righttoleftexample
URI righttoleft
VERSION 1.0
+ AUTO_RESOURCE_PREFIX
QML_FILES
"layoutdirection/layoutdirection.qml"
"layoutmirroring/layoutmirroring.qml"
diff --git a/examples/quick/righttoleft/righttoleft.qrc b/examples/quick/righttoleft/righttoleft.qrc
index 1d9f068a1e..07355828cc 100644
--- a/examples/quick/righttoleft/righttoleft.qrc
+++ b/examples/quick/righttoleft/righttoleft.qrc
@@ -1,5 +1,5 @@
<RCC>
- <qresource prefix="/righttoleft">
+ <qresource prefix="/qt/qml/righttoleft">
<file>righttoleft.qml</file>
<file>layoutdirection/layoutdirection.qml</file>
<file>layoutmirroring/layoutmirroring.qml</file>
diff --git a/examples/quick/shadereffects/CMakeLists.txt b/examples/quick/shadereffects/CMakeLists.txt
index d4e612816b..a22cbca812 100644
--- a/examples/quick/shadereffects/CMakeLists.txt
+++ b/examples/quick/shadereffects/CMakeLists.txt
@@ -30,6 +30,7 @@ target_link_libraries(shadereffectsexample PUBLIC
qt_add_qml_module(shadereffectsexample
URI shadereffects
VERSION 1.0
+ AUTO_RESOURCE_PREFIX
QML_FILES
"shadereffects.qml"
RESOURCES
diff --git a/examples/quick/shadereffects/shadereffects.qrc b/examples/quick/shadereffects/shadereffects.qrc
index f2d61d4297..7c432744ea 100644
--- a/examples/quick/shadereffects/shadereffects.qrc
+++ b/examples/quick/shadereffects/shadereffects.qrc
@@ -1,5 +1,5 @@
<RCC>
- <qresource prefix="/shadereffects">
+ <qresource prefix="/qt/qml/shadereffects">
<file>shadereffects.qml</file>
<file>content/face-smile.png</file>
<file>content/qt-logo.png</file>
diff --git a/examples/quick/shapes/CMakeLists.txt b/examples/quick/shapes/CMakeLists.txt
index 8cdb3e15b3..c5596b1658 100644
--- a/examples/quick/shapes/CMakeLists.txt
+++ b/examples/quick/shapes/CMakeLists.txt
@@ -34,6 +34,7 @@ add_dependencies(shapesexample shapes_shared)
qt_add_qml_module(shapesexample
URI shapes
VERSION 1.0
+ AUTO_RESOURCE_PREFIX
QML_FILES
"clippedtigers.qml"
"interactive.qml"
diff --git a/examples/quick/shapes/shapes.qrc b/examples/quick/shapes/shapes.qrc
index 60bf842a3a..846984b301 100644
--- a/examples/quick/shapes/shapes.qrc
+++ b/examples/quick/shapes/shapes.qrc
@@ -1,5 +1,5 @@
<RCC>
- <qresource prefix="/shapes">
+ <qresource prefix="/qt/qml/shapes">
<file>main.qml</file>
<file>shapegallery.qml</file>
<file>interactive.qml</file>
diff --git a/examples/quick/shared/CMakeLists.txt b/examples/quick/shared/CMakeLists.txt
index 545b1d1dca..0f51dedba2 100644
--- a/examples/quick/shared/CMakeLists.txt
+++ b/examples/quick/shared/CMakeLists.txt
@@ -13,6 +13,7 @@ qt_add_qml_module(${PROJECT_NAME}_shared
URI shared
VERSION 2.2
PLUGIN_TARGET ${PROJECT_NAME}_shared
+ AUTO_RESOURCE_PREFIX
SOURCES
"shared.h"
QML_FILES
diff --git a/examples/quick/shared/shared.h b/examples/quick/shared/shared.h
index 71b9ce8f9a..382aec4295 100644
--- a/examples/quick/shared/shared.h
+++ b/examples/quick/shared/shared.h
@@ -21,7 +21,6 @@
app.setApplicationName(QFileInfo(app.applicationFilePath()).baseName());\
QQuickView view;\
ADD_MACOS_BUNDLE_IMPORT_PATH\
- view.engine()->addImportPath(QStringLiteral(":/"));\
if (qEnvironmentVariableIntValue("QT_QUICK_CORE_PROFILE")) {\
QSurfaceFormat f = view.format();\
f.setProfile(QSurfaceFormat::CoreProfile);\
@@ -35,7 +34,7 @@
}\
view.connect(view.engine(), &QQmlEngine::quit, &app, &QCoreApplication::quit);\
new QQmlFileSelector(view.engine(), &view);\
- view.setSource(QUrl("qrc:///" #NAME ".qml")); \
+ view.setSource(QUrl("qrc:/qt/qml/" #NAME ".qml")); \
if (view.status() == QQuickView::Error)\
return -1;\
view.setResizeMode(QQuickView::SizeRootObjectToView);\
diff --git a/examples/quick/text/CMakeLists.txt b/examples/quick/text/CMakeLists.txt
index 63869e3c88..759c58a205 100644
--- a/examples/quick/text/CMakeLists.txt
+++ b/examples/quick/text/CMakeLists.txt
@@ -34,6 +34,7 @@ add_dependencies(textexample text_shared)
qt_add_qml_module(textexample
URI text
VERSION 1.0
+ AUTO_RESOURCE_PREFIX
QML_FILES
"fonts/availableFonts.qml"
"fonts/banner.qml"
diff --git a/examples/quick/text/text.qrc b/examples/quick/text/text.qrc
index f0d21627ad..a59d66fdbe 100644
--- a/examples/quick/text/text.qrc
+++ b/examples/quick/text/text.qrc
@@ -1,5 +1,5 @@
<RCC>
- <qresource prefix="/text">
+ <qresource prefix="/qt/qml/text">
<file>text.qml</file>
<file>fonts/availableFonts.qml</file>
<file>fonts/banner.qml</file>
diff --git a/examples/quick/threading/CMakeLists.txt b/examples/quick/threading/CMakeLists.txt
index 3176191364..c7eee5fca2 100644
--- a/examples/quick/threading/CMakeLists.txt
+++ b/examples/quick/threading/CMakeLists.txt
@@ -34,6 +34,7 @@ add_dependencies(threadingexample threading_shared)
qt_add_qml_module(threadingexample
URI threading
VERSION 1.0
+ AUTO_RESOURCE_PREFIX
QML_FILES
"threadedlistmodel/dataloader.mjs"
"threadedlistmodel/timedisplay.qml"
diff --git a/examples/quick/threading/threading.qrc b/examples/quick/threading/threading.qrc
index 5dc6dff443..e20d9a111e 100644
--- a/examples/quick/threading/threading.qrc
+++ b/examples/quick/threading/threading.qrc
@@ -1,5 +1,5 @@
<RCC>
- <qresource prefix="/threading">
+ <qresource prefix="/qt/qml/threading">
<file>threading.qml</file>
<file>threadedlistmodel/timedisplay.qml</file>
<file>threadedlistmodel/dataloader.mjs</file>
diff --git a/examples/quick/touchinteraction/CMakeLists.txt b/examples/quick/touchinteraction/CMakeLists.txt
index ba13336d12..f3212b6123 100644
--- a/examples/quick/touchinteraction/CMakeLists.txt
+++ b/examples/quick/touchinteraction/CMakeLists.txt
@@ -34,6 +34,7 @@ add_dependencies(touchinteractionexample touchinteraction_shared)
qt_add_qml_module(touchinteractionexample
URI touchinteraction
VERSION 1.0
+ AUTO_RESOURCE_PREFIX
QML_FILES
"flickable/Panel.qml"
"flickable/basic-flickable.qml"
diff --git a/examples/quick/touchinteraction/touchinteraction.qrc b/examples/quick/touchinteraction/touchinteraction.qrc
index cc5bcaceb0..6d0427b053 100644
--- a/examples/quick/touchinteraction/touchinteraction.qrc
+++ b/examples/quick/touchinteraction/touchinteraction.qrc
@@ -1,5 +1,5 @@
<RCC>
- <qresource prefix="/touchinteraction">
+ <qresource prefix="/qt/qml/touchinteraction">
<file>touchinteraction.qml</file>
<file>flickable/basic-flickable.qml</file>
<file>flickable/corkboards.qml</file>
diff --git a/examples/quick/tutorials/dynamicview/dynamicview1/CMakeLists.txt b/examples/quick/tutorials/dynamicview/dynamicview1/CMakeLists.txt
index 44a1fc8bb5..7d9f981143 100644
--- a/examples/quick/tutorials/dynamicview/dynamicview1/CMakeLists.txt
+++ b/examples/quick/tutorials/dynamicview/dynamicview1/CMakeLists.txt
@@ -23,6 +23,7 @@ set_target_properties(dynamicview1 PROPERTIES
qt_add_qml_module(dynamicview1
URI dynamicview
VERSION 1.0
+ AUTO_RESOURCE_PREFIX
QML_FILES
dynamicview.qml
PetsModel.qml
diff --git a/examples/quick/tutorials/dynamicview/dynamicview1/dynamicview1.qrc b/examples/quick/tutorials/dynamicview/dynamicview1/dynamicview1.qrc
index 18b503f9cc..07fe48ef38 100644
--- a/examples/quick/tutorials/dynamicview/dynamicview1/dynamicview1.qrc
+++ b/examples/quick/tutorials/dynamicview/dynamicview1/dynamicview1.qrc
@@ -1,5 +1,5 @@
<RCC>
- <qresource prefix="/dynamicview">
+ <qresource prefix="/qt/qml/dynamicview">
<file>dynamicview.qml</file>
<file>PetsModel.qml</file>
</qresource>
diff --git a/examples/quick/tutorials/dynamicview/dynamicview2/CMakeLists.txt b/examples/quick/tutorials/dynamicview/dynamicview2/CMakeLists.txt
index 5925925fc0..5031cf4a8b 100644
--- a/examples/quick/tutorials/dynamicview/dynamicview2/CMakeLists.txt
+++ b/examples/quick/tutorials/dynamicview/dynamicview2/CMakeLists.txt
@@ -23,6 +23,7 @@ set_target_properties(dynamicview2 PROPERTIES
qt_add_qml_module(dynamicview2
URI dynamicview
VERSION 1.0
+ AUTO_RESOURCE_PREFIX
QML_FILES
dynamicview.qml
PetsModel.qml
diff --git a/examples/quick/tutorials/dynamicview/dynamicview2/dynamicview2.qrc b/examples/quick/tutorials/dynamicview/dynamicview2/dynamicview2.qrc
index 18b503f9cc..07fe48ef38 100644
--- a/examples/quick/tutorials/dynamicview/dynamicview2/dynamicview2.qrc
+++ b/examples/quick/tutorials/dynamicview/dynamicview2/dynamicview2.qrc
@@ -1,5 +1,5 @@
<RCC>
- <qresource prefix="/dynamicview">
+ <qresource prefix="/qt/qml/dynamicview">
<file>dynamicview.qml</file>
<file>PetsModel.qml</file>
</qresource>
diff --git a/examples/quick/tutorials/dynamicview/dynamicview3/CMakeLists.txt b/examples/quick/tutorials/dynamicview/dynamicview3/CMakeLists.txt
index 8783fc6900..8710e0af55 100644
--- a/examples/quick/tutorials/dynamicview/dynamicview3/CMakeLists.txt
+++ b/examples/quick/tutorials/dynamicview/dynamicview3/CMakeLists.txt
@@ -23,6 +23,7 @@ set_target_properties(dynamicview3 PROPERTIES
qt_add_qml_module(dynamicview3
URI dynamicview
VERSION 1.0
+ AUTO_RESOURCE_PREFIX
QML_FILES
dynamicview.qml
PetsModel.qml
diff --git a/examples/quick/tutorials/dynamicview/dynamicview3/dynamicview3.qrc b/examples/quick/tutorials/dynamicview/dynamicview3/dynamicview3.qrc
index 18b503f9cc..07fe48ef38 100644
--- a/examples/quick/tutorials/dynamicview/dynamicview3/dynamicview3.qrc
+++ b/examples/quick/tutorials/dynamicview/dynamicview3/dynamicview3.qrc
@@ -1,5 +1,5 @@
<RCC>
- <qresource prefix="/dynamicview">
+ <qresource prefix="/qt/qml/dynamicview">
<file>dynamicview.qml</file>
<file>PetsModel.qml</file>
</qresource>
diff --git a/examples/quick/tutorials/dynamicview/dynamicview4/CMakeLists.txt b/examples/quick/tutorials/dynamicview/dynamicview4/CMakeLists.txt
index 700f08d556..9cc0c637d3 100644
--- a/examples/quick/tutorials/dynamicview/dynamicview4/CMakeLists.txt
+++ b/examples/quick/tutorials/dynamicview/dynamicview4/CMakeLists.txt
@@ -23,6 +23,7 @@ set_target_properties(dynamicview4 PROPERTIES
qt_add_qml_module(dynamicview4
URI dynamicview
VERSION 1.0
+ AUTO_RESOURCE_PREFIX
QML_FILES
dynamicview.qml
ListSelector.qml
diff --git a/examples/quick/tutorials/dynamicview/dynamicview4/dynamicview4.qrc b/examples/quick/tutorials/dynamicview/dynamicview4/dynamicview4.qrc
index 8615c442b2..c9afd50c38 100644
--- a/examples/quick/tutorials/dynamicview/dynamicview4/dynamicview4.qrc
+++ b/examples/quick/tutorials/dynamicview/dynamicview4/dynamicview4.qrc
@@ -1,5 +1,5 @@
<RCC>
- <qresource prefix="/dynamicview">
+ <qresource prefix="/qt/qml/dynamicview">
<file>dynamicview.qml</file>
<file>ListSelector.qml</file>
<file>PetsModel.qml</file>
diff --git a/examples/quick/tutorials/samegame/samegame1/CMakeLists.txt b/examples/quick/tutorials/samegame/samegame1/CMakeLists.txt
index d9448fff89..6fe0e50cd1 100644
--- a/examples/quick/tutorials/samegame/samegame1/CMakeLists.txt
+++ b/examples/quick/tutorials/samegame/samegame1/CMakeLists.txt
@@ -23,6 +23,7 @@ set_target_properties(samegame1 PROPERTIES
qt_add_qml_module(samegame1
URI samegame
VERSION 1.0
+ AUTO_RESOURCE_PREFIX
QML_FILES
"Block.qml"
"Button.qml"
diff --git a/examples/quick/tutorials/samegame/samegame1/samegame1.qrc b/examples/quick/tutorials/samegame/samegame1/samegame1.qrc
index 1f061d606f..47d37fccc5 100644
--- a/examples/quick/tutorials/samegame/samegame1/samegame1.qrc
+++ b/examples/quick/tutorials/samegame/samegame1/samegame1.qrc
@@ -1,5 +1,5 @@
<RCC>
- <qresource prefix="/samegame">
+ <qresource prefix="/qt/qml/samegame">
<file>Button.qml</file>
<file>Block.qml</file>
<file>samegame.qml</file>
diff --git a/examples/quick/tutorials/samegame/samegame2/CMakeLists.txt b/examples/quick/tutorials/samegame/samegame2/CMakeLists.txt
index 00d645904b..427649df5a 100644
--- a/examples/quick/tutorials/samegame/samegame2/CMakeLists.txt
+++ b/examples/quick/tutorials/samegame/samegame2/CMakeLists.txt
@@ -23,6 +23,7 @@ set_target_properties(samegame2 PROPERTIES
qt_add_qml_module(samegame2
URI samegame
VERSION 1.0
+ AUTO_RESOURCE_PREFIX
QML_FILES
"Block.qml"
"Button.qml"
diff --git a/examples/quick/tutorials/samegame/samegame2/samegame2.qrc b/examples/quick/tutorials/samegame/samegame2/samegame2.qrc
index f632e88f6a..50ed4cf815 100644
--- a/examples/quick/tutorials/samegame/samegame2/samegame2.qrc
+++ b/examples/quick/tutorials/samegame/samegame2/samegame2.qrc
@@ -1,5 +1,5 @@
<RCC>
- <qresource prefix="/samegame">
+ <qresource prefix="/qt/qml/samegame">
<file>Button.qml</file>
<file>Block.qml</file>
<file>samegame.qml</file>
diff --git a/examples/quick/tutorials/samegame/samegame3/CMakeLists.txt b/examples/quick/tutorials/samegame/samegame3/CMakeLists.txt
index ca438bd0b5..c63595b684 100644
--- a/examples/quick/tutorials/samegame/samegame3/CMakeLists.txt
+++ b/examples/quick/tutorials/samegame/samegame3/CMakeLists.txt
@@ -23,6 +23,7 @@ set_target_properties(samegame3 PROPERTIES
qt_add_qml_module(samegame3
URI samegame
VERSION 1.0
+ AUTO_RESOURCE_PREFIX
QML_FILES
"Block.qml"
"Button.qml"
diff --git a/examples/quick/tutorials/samegame/samegame3/samegame3.qrc b/examples/quick/tutorials/samegame/samegame3/samegame3.qrc
index 16c90b4516..11e4c66a56 100644
--- a/examples/quick/tutorials/samegame/samegame3/samegame3.qrc
+++ b/examples/quick/tutorials/samegame/samegame3/samegame3.qrc
@@ -1,5 +1,5 @@
<RCC>
- <qresource prefix="/samegame">
+ <qresource prefix="/qt/qml/samegame">
<file>Button.qml</file>
<file>Block.qml</file>
<file>Dialog.qml</file>
diff --git a/examples/quick/tutorials/samegame/samegame4/CMakeLists.txt b/examples/quick/tutorials/samegame/samegame4/CMakeLists.txt
index fb3ebe1885..0eeb2ecf98 100644
--- a/examples/quick/tutorials/samegame/samegame4/CMakeLists.txt
+++ b/examples/quick/tutorials/samegame/samegame4/CMakeLists.txt
@@ -23,6 +23,7 @@ set_target_properties(samegame4 PROPERTIES
qt_add_qml_module(samegame4
URI samegame
VERSION 1.0
+ AUTO_RESOURCE_PREFIX
QML_FILES
"BoomBlock.qml"
"Button.qml"
diff --git a/examples/quick/tutorials/samegame/samegame4/samegame4.qrc b/examples/quick/tutorials/samegame/samegame4/samegame4.qrc
index 9dc482d7de..44c5fbbaf3 100644
--- a/examples/quick/tutorials/samegame/samegame4/samegame4.qrc
+++ b/examples/quick/tutorials/samegame/samegame4/samegame4.qrc
@@ -1,5 +1,5 @@
<RCC>
- <qresource prefix="/samegame">
+ <qresource prefix="/qt/qml/samegame">
<file>samegame.qml</file>
<file>BoomBlock.qml</file>
<file>Button.qml</file>
diff --git a/examples/quick/views/CMakeLists.txt b/examples/quick/views/CMakeLists.txt
index 56229edbf5..1ea9e737c9 100644
--- a/examples/quick/views/CMakeLists.txt
+++ b/examples/quick/views/CMakeLists.txt
@@ -34,6 +34,7 @@ add_dependencies(viewsexample views_shared)
qt_add_qml_module(viewsexample
URI views
VERSION 1.0
+ AUTO_RESOURCE_PREFIX
QML_FILES
"delegatemodel/dragselection.qml"
"delegatemodel/slideshow.qml"
diff --git a/examples/quick/views/views.qrc b/examples/quick/views/views.qrc
index 1646c49e81..67e708ff93 100644
--- a/examples/quick/views/views.qrc
+++ b/examples/quick/views/views.qrc
@@ -1,5 +1,5 @@
<RCC>
- <qresource prefix="/views">
+ <qresource prefix="/qt/qml/views">
<file>gridview/gridview-example.qml</file>
<file>gridview/pics/AddressBook_48.png</file>
<file>gridview/pics/AudioPlayer_48.png</file>
diff --git a/examples/quick/window/CMakeLists.txt b/examples/quick/window/CMakeLists.txt
index d041a82816..8d59f4008e 100644
--- a/examples/quick/window/CMakeLists.txt
+++ b/examples/quick/window/CMakeLists.txt
@@ -25,6 +25,7 @@ set_target_properties(windowexample PROPERTIES
qt_add_qml_module(windowexample
URI window
VERSION 1.0
+ AUTO_RESOURCE_PREFIX
QML_FILES
"AllScreens.qml"
"CurrentScreen.qml"
diff --git a/examples/quick/window/main.cpp b/examples/quick/window/main.cpp
index 47dfa01f61..8de2aa8eef 100644
--- a/examples/quick/window/main.cpp
+++ b/examples/quick/window/main.cpp
@@ -14,16 +14,13 @@ int main(int argc, char* argv[])
QGuiApplication app(argc, argv);
QQmlEngine engine;
- // Add the qrc root as QML import path so that the "shared" module can be found.
- engine.addImportPath(QStringLiteral(":/"));
-
#ifdef Q_OS_MACOS
engine.addImportPath(app.applicationDirPath() + QStringLiteral("/../PlugIns"));
#endif
QQmlComponent component(&engine);
QQuickWindow::setDefaultAlphaBuffer(true);
- component.loadUrl(QUrl("qrc:///window/window.qml"));
+ component.loadUrl(QUrl("qrc:/qt/qml/window/window.qml"));
if ( component.isReady() )
component.create();
else