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/mediaplayer | |
| 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/mediaplayer')
| -rw-r--r-- | basicsuite/mediaplayer/mediaplayer.pro | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/basicsuite/mediaplayer/mediaplayer.pro b/basicsuite/mediaplayer/mediaplayer.pro index 893539f..4667caf 100644 --- a/basicsuite/mediaplayer/mediaplayer.pro +++ b/basicsuite/mediaplayer/mediaplayer.pro @@ -4,11 +4,26 @@ include(../shared/shared.pri) b2qtdemo_deploy_defaults() content.files = \ - *.qml \ + Content.qml \ + ContentVideo.qml \ + ControlBar.qml \ + EffectSelectionPanel.qml \ + FileBrowser.qml \ + ImageButton.qml \ + Intro.qml \ + main.qml \ + MetadataView.qml \ + ParameterPanel.qml \ + PlaybackControl.qml \ + SeekControl.qml \ + Slider.qml \ + UrlBar.qml \ + VolumeControl.qml \ Effects \ images + content.path = $$DESTPATH OTHER_FILES += $${content.files} -INSTALLS += target content
\ No newline at end of file +INSTALLS += target content |