From 33966b5b9b026f24ac94c0905280deb4d004df81 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Wed, 24 Oct 2018 14:49:50 +0200 Subject: Stop using wildcards with "direct" RESOURCES syntax in examples Build tools cannot detect when new files are added with this syntax. As we don't use wildcards with SOURCES, we also shouldn't use them with RESOURCES either. Change-Id: Ic42ee9d892a4f18a1a21bd757d7398a50792a6c7 Fixes: QTBUG-71321 Reviewed-by: Richard Moe Gustavsen Reviewed-by: Simon Hausmann --- .../quickcontrols2/contactlist/contactlist.pro | 8 +++- examples/quickcontrols2/flatstyle/flatstyle.pro | 12 +++-- examples/quickcontrols2/gallery/gallery.pro | 54 ++++++++++++++++++++-- examples/quickcontrols2/sidepanel/sidepanel.pro | 9 +++- 4 files changed, 73 insertions(+), 10 deletions(-) (limited to 'examples') diff --git a/examples/quickcontrols2/contactlist/contactlist.pro b/examples/quickcontrols2/contactlist/contactlist.pro index 9025dbde..101db15a 100644 --- a/examples/quickcontrols2/contactlist/contactlist.pro +++ b/examples/quickcontrols2/contactlist/contactlist.pro @@ -10,7 +10,13 @@ SOURCES += \ contactmodel.cpp RESOURCES += \ - $$files(*.qml) + ContactDelegate.ui.qml \ + ContactDialog.qml \ + ContactForm.ui.qml \ + contactlist.qml \ + ContactView.ui.qml \ + designer/Backend/ContactModel.qml \ + SectionDelegate.ui.qml # Additional import path used to resolve QML modules just for Qt Quick Designer QML_DESIGNER_IMPORT_PATH = $$PWD/designer diff --git a/examples/quickcontrols2/flatstyle/flatstyle.pro b/examples/quickcontrols2/flatstyle/flatstyle.pro index a8ca01bf..fe9e42a8 100644 --- a/examples/quickcontrols2/flatstyle/flatstyle.pro +++ b/examples/quickcontrols2/flatstyle/flatstyle.pro @@ -6,10 +6,14 @@ QT += quick quickcontrols2 widgets SOURCES += main.cpp RESOURCES += \ - qtquickcontrols2.conf \ - $$files(*.qml) \ - $$files(imports/Theme/*) \ - $$files(Flat/*.qml) + qtquickcontrols2.conf \ + flatstyle.qml \ + MainForm.ui.qml \ + Flat/Button.qml \ + Flat/CheckBox.qml \ + Flat/Switch.qml \ + imports/Theme/Theme.qml \ + imports/Theme/qmldir # Additional import path used to resolve QML modules in Qt Creator's code model QML_IMPORT_PATH = $$PWD/imports diff --git a/examples/quickcontrols2/gallery/gallery.pro b/examples/quickcontrols2/gallery/gallery.pro index 705eeae0..2b898fca 100644 --- a/examples/quickcontrols2/gallery/gallery.pro +++ b/examples/quickcontrols2/gallery/gallery.pro @@ -7,11 +7,59 @@ SOURCES += \ RESOURCES += \ gallery.qml \ + pages/BusyIndicatorPage.qml \ + pages/ButtonPage.qml \ + pages/CheckBoxPage.qml \ + pages/ComboBoxPage.qml \ + pages/DelayButtonPage.qml \ + pages/DelegatePage.qml \ + pages/DialogPage.qml \ + pages/DialPage.qml \ + pages/FramePage.qml \ + pages/GroupBoxPage.qml \ + pages/PageIndicatorPage.qml \ + pages/ProgressBarPage.qml \ + pages/RadioButtonPage.qml \ + pages/RangeSliderPage.qml \ + pages/ScrollablePage.qml \ + pages/ScrollBarPage.qml \ + pages/ScrollIndicatorPage.qml \ + pages/SliderPage.qml \ + pages/SpinBoxPage.qml \ + pages/StackViewPage.qml \ + pages/SwipeViewPage.qml \ + pages/SwitchPage.qml \ + pages/TabBarPage.qml \ + pages/TextAreaPage.qml \ + pages/TextFieldPage.qml \ + pages/ToolTipPage.qml \ + pages/TumblerPage.qml \ qtquickcontrols2.conf \ icons/gallery/index.theme \ - $$files(icons/*.png, true) \ - $$files(images/*.png) \ - $$files(pages/*.qml) + icons/gallery/20x20/back.png \ + icons/gallery/20x20/drawer.png \ + icons/gallery/20x20/menu.png \ + icons/gallery/20x20@2/back.png \ + icons/gallery/20x20@2/drawer.png \ + icons/gallery/20x20@2/menu.png \ + icons/gallery/20x20@3/back.png \ + icons/gallery/20x20@3/drawer.png \ + icons/gallery/20x20@3/menu.png \ + icons/gallery/20x20@4/back.png \ + icons/gallery/20x20@4/drawer.png \ + icons/gallery/20x20@4/menu.png \ + images/arrow.png \ + images/arrow@2x.png \ + images/arrow@3x.png \ + images/arrow@4x.png \ + images/arrows.png \ + images/arrows@2x.png \ + images/arrows@3x.png \ + images/arrows@4x.png \ + images/qt-logo.png \ + images/qt-logo@2x.png \ + images/qt-logo@3x.png \ + images/qt-logo@4x.png target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/gallery INSTALLS += target diff --git a/examples/quickcontrols2/sidepanel/sidepanel.pro b/examples/quickcontrols2/sidepanel/sidepanel.pro index e2fc4aff..1fddc70a 100644 --- a/examples/quickcontrols2/sidepanel/sidepanel.pro +++ b/examples/quickcontrols2/sidepanel/sidepanel.pro @@ -6,8 +6,13 @@ SOURCES += \ sidepanel.cpp RESOURCES += \ - sidepanel.qml \ - $$files(images/*.png) + doc/images/qtquickcontrols2-sidepanel-landscape.png \ + doc/images/qtquickcontrols2-sidepanel-portrait.png \ + images/qt-logo@2x.png \ + images/qt-logo@3x.png \ + images/qt-logo@4x.png \ + images/qt-logo.png \ + sidepanel.qml target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/sidepanel INSTALLS += target -- cgit v1.2.3