diff options
| author | Ed Cooke <ed.cooke@qt.io> | 2024-04-15 15:40:38 +0200 |
|---|---|---|
| committer | Oliver Eftevaag <oliver.eftevaag@qt.io> | 2024-04-15 20:17:11 +0200 |
| commit | 6c73363cd314bdde6d019db1e57a74c40d8bdd90 (patch) | |
| tree | b3cd394321f73a925eb793affdba51b6b3ccd1d2 | |
| parent | 8fcb37dcf51f836dcc10ac86b33e417f6e5b4187 (diff) | |
Add qmldir file to calqlatr example
In order for the calqlatr example to successfully load Main.qml when
building with qmake, a qmldir file needs to be added.
In addition, the files listed in OTHER_FILES, were redundant, since
those files were already listed as qrc resources.
Fixes: QTBUG-123714
Pick-to: 6.6 6.7
Change-Id: Id773ecf93c9b113385121da62de99ced3f8debdf
Reviewed-by: Santhosh Kumar <santhosh.kumar.selvaraj@qt.io>
| -rw-r--r-- | examples/demos/calqlatr/calqlatr.pro | 9 | ||||
| -rw-r--r-- | examples/demos/calqlatr/calqlatr.qrc | 3 | ||||
| -rw-r--r-- | examples/demos/calqlatr/qmldir | 7 |
3 files changed, 9 insertions, 10 deletions
diff --git a/examples/demos/calqlatr/calqlatr.pro b/examples/demos/calqlatr/calqlatr.pro index 36aa7775b..661e5346b 100644 --- a/examples/demos/calqlatr/calqlatr.pro +++ b/examples/demos/calqlatr/calqlatr.pro @@ -5,14 +5,5 @@ SOURCES += main.cpp RESOURCES += calqlatr.qrc -OTHER_FILES = Main.qml \ - content/Display.qml \ - content/NumberPad.qml \ - content/CalculatorButton.qml \ - content/calculator.js \ - content/BackspaceButton.qml \ - content/images/backspace.svg \ - content/images/backspace_fill.svg \ - target.path = $$[QT_INSTALL_EXAMPLES]/demos/calqlatr INSTALLS += target diff --git a/examples/demos/calqlatr/calqlatr.qrc b/examples/demos/calqlatr/calqlatr.qrc index e3bc1dbf5..350011e6e 100644 --- a/examples/demos/calqlatr/calqlatr.qrc +++ b/examples/demos/calqlatr/calqlatr.qrc @@ -1,5 +1,6 @@ <RCC> - <qresource prefix="/demos/calqlatr"> + <qresource prefix="/qt/qml/demos/calqlatr"> + <file>qmldir</file> <file>Main.qml</file> <file>content/calculator.js</file> <file>content/Display.qml</file> diff --git a/examples/demos/calqlatr/qmldir b/examples/demos/calqlatr/qmldir new file mode 100644 index 000000000..d1b7b5ecf --- /dev/null +++ b/examples/demos/calqlatr/qmldir @@ -0,0 +1,7 @@ +module demos.calqlatr +prefer :/qt/qml/demos/calqlatr/ +Main 1.0 Main.qml +Display 1.0 content/Display.qml +NumberPad 1.0 content/NumberPad.qml +CalculatorButton 1.0 content/CalculatorButton.qml +BackspaceButton 1.0 content/BackspaceButton.qml |