diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2016-12-12 15:01:31 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2016-12-12 15:02:01 +0200 |
| commit | 67b8236c15154085adaa9195b818511ad17c06d6 (patch) | |
| tree | dd1f359c2e3e6f209cc7d3742047b63b4fdabf21 /basicsuite/enterprise-gallery/enterprise-gallery.pro | |
| parent | 9f09b4b3fea17e7ef3a4ce3701e70b480dbd4b0a (diff) | |
| parent | f8eb954d797a5f571144c985eb3ac3dc7c2bc885 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
* origin/5.7:
Remove wildcard in enterprise-gallery demo .pro file
Change-Id: Idcaabd1b44e8c8e2e5095860532bbb7a5e8eb302
Diffstat (limited to 'basicsuite/enterprise-gallery/enterprise-gallery.pro')
| -rw-r--r-- | basicsuite/enterprise-gallery/enterprise-gallery.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/basicsuite/enterprise-gallery/enterprise-gallery.pro b/basicsuite/enterprise-gallery/enterprise-gallery.pro index accbc9d..3b00a42 100644 --- a/basicsuite/enterprise-gallery/enterprise-gallery.pro +++ b/basicsuite/enterprise-gallery/enterprise-gallery.pro @@ -4,7 +4,7 @@ include(../shared/shared.pri) b2qtdemo_deploy_defaults() content.files = \ - *.qml \ + main.qml \ qml \ fonts \ images |