qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <richard.gustavsen@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Mitch Curtis 2018-10-24 14:49:50 +02:00
parent 1abdfe5d5a
commit 33966b5b9b
4 changed files with 73 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
examples/quickcontrols2/contactlist/contactlist.pro
View File

@ -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

12
examples/quickcontrols2/flatstyle/flatstyle.pro
View File

@ -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

54
examples/quickcontrols2/gallery/gallery.pro
View File

@ -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

9
examples/quickcontrols2/sidepanel/sidepanel.pro
View File

@ -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