diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2016-12-08 09:12:50 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2016-12-08 09:15:26 +0200 |
| commit | 21b73aea69a45e2f7bcbdf1b10e9908ae6bd9559 (patch) | |
| tree | 4ed2def89d6e312c70a0ce6355cb2ea28767c458 /basicsuite/qt5-cinematicdemo | |
| parent | 78eb50815059026b50849eb45b95654c59ba88dc (diff) | |
| parent | 5b26955f50d34afbb4938b00ba629a61be10b15d (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
* origin/5.6:
Fixed demo .pro files: removed exclude.txt and wildcards used with content files
Change-Id: I052c0f87dce2b5f8f7fc71647944e620fa6d0055
Diffstat (limited to 'basicsuite/qt5-cinematicdemo')
| -rw-r--r-- | basicsuite/qt5-cinematicdemo/qt5-cinematicdemo.pro | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/basicsuite/qt5-cinematicdemo/qt5-cinematicdemo.pro b/basicsuite/qt5-cinematicdemo/qt5-cinematicdemo.pro index b4c5ae8..d6bd1f9 100644 --- a/basicsuite/qt5-cinematicdemo/qt5-cinematicdemo.pro +++ b/basicsuite/qt5-cinematicdemo/qt5-cinematicdemo.pro @@ -4,11 +4,11 @@ include(../shared/shared.pri) b2qtdemo_deploy_defaults() content.files = \ - *.qml \ - *.png \ + main.qml \ content + content.path = $$DESTPATH OTHER_FILES += $${content.files} -INSTALLS += target content
\ No newline at end of file +INSTALLS += target content |