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/camera | |
| 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/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} |