diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-07-21 11:06:20 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-07-21 10:06:23 +0000 |
| commit | 5690e86326841aff8ff45516dfcbf1d7218c8a1d (patch) | |
| tree | 29077a33565500f71ae11aa6e5cb458b8067f4ac | |
| parent | da9831af00d25545ff7fd080eabc13379d5d3dfe (diff) | |
Gallery: use the new .pro syntax for RESOURCES
A .qrc file is no longer mandatory. One can list resources directly
in the RESOURCES variable. This results to a flatter Resources-tree
in Qt Creator's project tree.
Change-Id: If272e4a7974f433552cb848ddc83827dd09669d6
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| -rw-r--r-- | examples/quickcontrols2/gallery/gallery.pro | 9 | ||||
| -rw-r--r-- | examples/quickcontrols2/gallery/gallery.qrc | 61 |
2 files changed, 4 insertions, 66 deletions
diff --git a/examples/quickcontrols2/gallery/gallery.pro b/examples/quickcontrols2/gallery/gallery.pro index cb0736fd..fbfc3df8 100644 --- a/examples/quickcontrols2/gallery/gallery.pro +++ b/examples/quickcontrols2/gallery/gallery.pro @@ -5,12 +5,11 @@ QT += quick quickcontrols2 SOURCES += \ gallery.cpp -OTHER_FILES += \ - gallery.qml \ - pages/*.qml - RESOURCES += \ - gallery.qrc + gallery.qml \ + qtquickcontrols2.conf \ + $$files(images/*.png) \ + $$files(pages/*.qml) target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/gallery INSTALLS += target diff --git a/examples/quickcontrols2/gallery/gallery.qrc b/examples/quickcontrols2/gallery/gallery.qrc deleted file mode 100644 index 01c61324..00000000 --- a/examples/quickcontrols2/gallery/gallery.qrc +++ /dev/null @@ -1,61 +0,0 @@ -<RCC> - <qresource prefix="/"> - <file>gallery.qml</file> - <file>qtquickcontrols2.conf</file> - <file>images/arrow.png</file> - <file>images/arrow@2x.png</file> - <file>images/arrow@3x.png</file> - <file>images/arrow@4x.png</file> - <file>images/arrows.png</file> - <file>images/arrows@2x.png</file> - <file>images/arrows@3x.png</file> - <file>images/arrows@4x.png</file> - <file>images/drawer.png</file> - <file>images/drawer@2x.png</file> - <file>images/drawer@3x.png</file> - <file>images/drawer@4x.png</file> - <file>images/menu.png</file> - <file>images/menu@2x.png</file> - <file>images/menu@3x.png</file> - <file>images/menu@4x.png</file> - <file>images/+material/drawer.png</file> - <file>images/+material/drawer@2x.png</file> - <file>images/+material/drawer@3x.png</file> - <file>images/+material/drawer@4x.png</file> - <file>images/+material/menu.png</file> - <file>images/+material/menu@2x.png</file> - <file>images/+material/menu@3x.png</file> - <file>images/+material/menu@4x.png</file> - <file>images/qt-logo.png</file> - <file>images/qt-logo@2x.png</file> - <file>images/qt-logo@3x.png</file> - <file>images/qt-logo@4x.png</file> - <file>pages/BusyIndicatorPage.qml</file> - <file>pages/ButtonPage.qml</file> - <file>pages/CheckBoxPage.qml</file> - <file>pages/ComboBoxPage.qml</file> - <file>pages/DialPage.qml</file> - <file>pages/DrawerPage.qml</file> - <file>pages/FramePage.qml</file> - <file>pages/GroupBoxPage.qml</file> - <file>pages/MenuPage.qml</file> - <file>pages/PageIndicatorPage.qml</file> - <file>pages/PopupPage.qml</file> - <file>pages/ProgressBarPage.qml</file> - <file>pages/RadioButtonPage.qml</file> - <file>pages/RangeSliderPage.qml</file> - <file>pages/ScrollBarPage.qml</file> - <file>pages/ScrollIndicatorPage.qml</file> - <file>pages/SliderPage.qml</file> - <file>pages/SpinBoxPage.qml</file> - <file>pages/StackViewPage.qml</file> - <file>pages/SwipeViewPage.qml</file> - <file>pages/SwitchPage.qml</file> - <file>pages/TabBarPage.qml</file> - <file>pages/TextAreaPage.qml</file> - <file>pages/TextFieldPage.qml</file> - <file>pages/ToolTipPage.qml</file> - <file>pages/TumblerPage.qml</file> - <file>pages/DelegatePage.qml</file> - </qresource> -</RCC> |