diff options
author | Simon Hausmann <simon.hausmann@qt.io> | 2018-08-23 12:34:15 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2018-08-23 11:27:53 +0000 |
commit | 25b032a522a993808f9fc17bc767eb54ae3813a2 (patch) | |
tree | de45ec330db68de86b81a06bcf7f166c3ee65ca7 /examples | |
parent | ddd892f891cfbb8861a7ea37d74a53c6455a1513 (diff) |
Clean up resource handling in photoviewer example
Use the modern RESOURCES syntax in the .pro file to replace the XML
file on disk.
Change-Id: I8dbfbe55242c93178e2bfcd2a1ad8f4d63a510bb
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'examples')
-rw-r--r-- | examples/demos/photoviewer/photoviewer.pro | 15 | ||||
-rw-r--r-- | examples/demos/photoviewer/qml.qrc | 17 |
2 files changed, 14 insertions, 18 deletions
diff --git a/examples/demos/photoviewer/photoviewer.pro b/examples/demos/photoviewer/photoviewer.pro index b578810bc..aa9bb82d5 100644 --- a/examples/demos/photoviewer/photoviewer.pro +++ b/examples/demos/photoviewer/photoviewer.pro @@ -16,7 +16,20 @@ TRANSLATIONS += i18n/qml_fr.ts \ EXTRA_TRANSLATIONS += i18n/qml_en.ts -RESOURCES += qml.qrc +RESOURCES += main.qml \ + PhotoViewerCore/AlbumDelegate.qml \ + PhotoViewerCore/BusyIndicator.qml \ + PhotoViewerCore/Button.qml \ + PhotoViewerCore/EditableButton.qml \ + PhotoViewerCore/PhotoDelegate.qml \ + PhotoViewerCore/ProgressBar.qml \ + PhotoViewerCore/RssModel.qml \ + PhotoViewerCore/Tag.qml \ + PhotoViewerCore/images/box-shadow.png \ + PhotoViewerCore/images/busy.png \ + PhotoViewerCore/images/cardboard.png \ + PhotoViewerCore/script/script.js \ + target.path = $$[QT_INSTALL_EXAMPLES]/demos/photoviewer INSTALLS += target diff --git a/examples/demos/photoviewer/qml.qrc b/examples/demos/photoviewer/qml.qrc deleted file mode 100644 index d15672e5a..000000000 --- a/examples/demos/photoviewer/qml.qrc +++ /dev/null @@ -1,17 +0,0 @@ -<RCC> - <qresource prefix="/"> - <file>main.qml</file> - <file>PhotoViewerCore/AlbumDelegate.qml</file> - <file>PhotoViewerCore/BusyIndicator.qml</file> - <file>PhotoViewerCore/Button.qml</file> - <file>PhotoViewerCore/EditableButton.qml</file> - <file>PhotoViewerCore/PhotoDelegate.qml</file> - <file>PhotoViewerCore/ProgressBar.qml</file> - <file>PhotoViewerCore/RssModel.qml</file> - <file>PhotoViewerCore/Tag.qml</file> - <file>PhotoViewerCore/images/box-shadow.png</file> - <file>PhotoViewerCore/images/busy.png</file> - <file>PhotoViewerCore/images/cardboard.png</file> - <file>PhotoViewerCore/script/script.js</file> - </qresource> -</RCC> |