diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2016-12-08 09:42:42 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2016-12-09 14:40:26 +0200 |
| commit | 9f09b4b3fea17e7ef3a4ce3701e70b480dbd4b0a (patch) | |
| tree | 8cd75a6c1d40783db8198a105e95eee956a52602 /basicsuite/camera | |
| parent | b9585b440819e1444b20f30435f81c46801158c5 (diff) | |
| parent | 21b73aea69a45e2f7bcbdf1b10e9908ae6bd9559 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
* origin/5.7:
Fixed demo .pro files: removed exclude.txt and wildcards used with content files
Change-Id: Icb391cbcf1796879417e42ebf206d07bd03d2fae
Diffstat (limited to 'basicsuite/camera')
| -rw-r--r-- | basicsuite/camera/app.pro | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/basicsuite/camera/app.pro b/basicsuite/camera/app.pro index b588a0d..96a02a4 100644 --- a/basicsuite/camera/app.pro +++ b/basicsuite/camera/app.pro @@ -4,8 +4,18 @@ include(../shared/shared.pri) b2qtdemo_deploy_defaults() content.files = \ - *.qml \ - *.png + CameraControlButton.qml \ + CameraSetting.qml \ + CaptureControl.qml \ + CapturePreview.qml \ + Controls.qml \ + FocusControl.qml \ + main.qml \ + Picker.qml \ + RecordingTime.qml \ + Slider.qml \ + ZoomControl.qml + content.path = $$DESTPATH OTHER_FILES += $${content.files} |