diff options
author | Kimmo Ollila <Kimmo.Ollila@qt.io> | 2016-12-07 15:10:43 +0200 |
---|---|---|
committer | Kimmo Ollila <kimmo.ollila@theqtcompany.com> | 2016-12-08 07:09:35 +0000 |
commit | 5b26955f50d34afbb4938b00ba629a61be10b15d (patch) | |
tree | 030afe9dae24bf59070d01cc804d693318a9f228 | |
parent | 2dcc014980437b87564b7f9f86a06894efa5ea75 (diff) |
Fixed demo .pro files: removed exclude.txt and wildcards used with content files
Change-Id: Id4731a6438c95ca9abca5e8477bd17228c55cfc7
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
-rw-r--r-- | basicsuite/about-b2qt/about-b2qt.pro | 10 | ||||
-rw-r--r-- | basicsuite/camera/app.pro | 14 | ||||
-rw-r--r-- | basicsuite/canvas3d-planets/canvas3d-planets.pro | 14 | ||||
-rw-r--r-- | basicsuite/enterprise-charts/enterprise-charts.pro | 18 | ||||
-rw-r--r-- | basicsuite/enterprise-dashboard/enterprise-dashboard.pro | 3 | ||||
-rw-r--r-- | basicsuite/enterprise-flat-controls/enterprise-flat-controls.pro | 7 | ||||
-rw-r--r-- | basicsuite/enterprise-qtdatavis3d/enterprise-qtdatavis3d.pro | 6 | ||||
-rw-r--r-- | basicsuite/graphicaleffects/graphicaleffects.pro | 17 | ||||
-rw-r--r-- | basicsuite/mediaplayer/mediaplayer.pro | 19 | ||||
-rw-r--r-- | basicsuite/qt5-cinematicdemo/qt5-cinematicdemo.pro | 6 | ||||
-rw-r--r-- | basicsuite/qtwebbrowser/app.pro | 4 | ||||
-rw-r--r-- | basicsuite/shared/shared.pri | 1 | ||||
-rw-r--r-- | basicsuite/textinput/textinput.pro | 8 |
13 files changed, 101 insertions, 26 deletions
diff --git a/basicsuite/about-b2qt/about-b2qt.pro b/basicsuite/about-b2qt/about-b2qt.pro index a99c8e6..36d106e 100644 --- a/basicsuite/about-b2qt/about-b2qt.pro +++ b/basicsuite/about-b2qt/about-b2qt.pro @@ -4,8 +4,14 @@ include(../shared/shared.pri) b2qtdemo_deploy_defaults() content.files = \ - *.qml \ - *.png + AboutBoot2Qt.qml \ + Box.qml \ + ContentText.qml \ + main.qml \ + Title.qml \ + codeless.png \ + particle_star2.png + content.path = $$DESTPATH OTHER_FILES += $${content.files} 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} diff --git a/basicsuite/canvas3d-planets/canvas3d-planets.pro b/basicsuite/canvas3d-planets/canvas3d-planets.pro index c3c3ff5..c332393 100644 --- a/basicsuite/canvas3d-planets/canvas3d-planets.pro +++ b/basicsuite/canvas3d-planets/canvas3d-planets.pro @@ -4,8 +4,18 @@ include(../shared/shared.pri) b2qtdemo_deploy_defaults() content.files = \ - *.qml \ - *.js \ + ControlEventSource.qml \ + FpsDisplay.qml \ + InfoSheet.qml \ + main.qml \ + PlanetButton.qml \ + planets.qml\ + StyledSlider.qml\ + gl-matrix.js \ + planets.js \ + three.js \ + ThreeJSLoader.js \ + threex.planets.js \ images content.path = $$DESTPATH diff --git a/basicsuite/enterprise-charts/enterprise-charts.pro b/basicsuite/enterprise-charts/enterprise-charts.pro index 13c41cf..7896c62 100644 --- a/basicsuite/enterprise-charts/enterprise-charts.pro +++ b/basicsuite/enterprise-charts/enterprise-charts.pro @@ -4,9 +4,23 @@ include(../shared/shared.pri) b2qtdemo_deploy_defaults() content.files = \ - *.qml + loader.qml \ + main.qml \ + View1.qml \ + View10.qml \ + View11.qml \ + View12.qml \ + View2.qml \ + View3.qml \ + View4.qml \ + View5.qml \ + View6.qml \ + View7.qml \ + View8.qml \ + View9.qml + content.path = $$DESTPATH OTHER_FILES += $${content.files} -INSTALLS += target content
\ No newline at end of file +INSTALLS += target content diff --git a/basicsuite/enterprise-dashboard/enterprise-dashboard.pro b/basicsuite/enterprise-dashboard/enterprise-dashboard.pro index d61e3a6..dcdb5e3 100644 --- a/basicsuite/enterprise-dashboard/enterprise-dashboard.pro +++ b/basicsuite/enterprise-dashboard/enterprise-dashboard.pro @@ -4,9 +4,10 @@ include(../shared/shared.pri) b2qtdemo_deploy_defaults() content.files = \ - *.qml \ + main.qml \ qml \ images + content.path = $$DESTPATH OTHER_FILES += $${content.files} diff --git a/basicsuite/enterprise-flat-controls/enterprise-flat-controls.pro b/basicsuite/enterprise-flat-controls/enterprise-flat-controls.pro index accbc9d..eec4c3e 100644 --- a/basicsuite/enterprise-flat-controls/enterprise-flat-controls.pro +++ b/basicsuite/enterprise-flat-controls/enterprise-flat-controls.pro @@ -4,10 +4,11 @@ include(../shared/shared.pri) b2qtdemo_deploy_defaults() content.files = \ - *.qml \ - qml \ - fonts \ + Content.qml \ + main.qml \ + SettingsIcon.qml \ images + content.path = $$DESTPATH OTHER_FILES += $${content.files} diff --git a/basicsuite/enterprise-qtdatavis3d/enterprise-qtdatavis3d.pro b/basicsuite/enterprise-qtdatavis3d/enterprise-qtdatavis3d.pro index 6f2feac..d4245ee 100644 --- a/basicsuite/enterprise-qtdatavis3d/enterprise-qtdatavis3d.pro +++ b/basicsuite/enterprise-qtdatavis3d/enterprise-qtdatavis3d.pro @@ -6,8 +6,10 @@ b2qtdemo_deploy_defaults() QT += datavisualization content.files = \ - *.qml \ - *.png + main.qml \ + layer_1.png \ + layer_2.png \ + layer_3.png \ content.path = $$DESTPATH diff --git a/basicsuite/graphicaleffects/graphicaleffects.pro b/basicsuite/graphicaleffects/graphicaleffects.pro index 42e14ec..2c51fe7 100644 --- a/basicsuite/graphicaleffects/graphicaleffects.pro +++ b/basicsuite/graphicaleffects/graphicaleffects.pro @@ -4,10 +4,23 @@ include(../shared/shared.pri) b2qtdemo_deploy_defaults() content.files = \ - *.qml \ + Checkers.qml \ + effect_BrightnessContrast.qml \ + effect_Colorize.qml \ + effect_CustomDissolve.qml \ + effect_CustomWave.qml \ + effect_Displacement.qml \ + effect_DropShadow.qml \ + effect_GaussianBlur.qml \ + effect_Glow.qml \ + effect_HueSaturation.qml \ + effect_OpacityMask.qml \ + effect_ThresholdMask.qml \ + main.qml \ images + content.path = $$DESTPATH OTHER_FILES += $${content.files} -INSTALLS += target content
\ No newline at end of file +INSTALLS += target content 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 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 diff --git a/basicsuite/qtwebbrowser/app.pro b/basicsuite/qtwebbrowser/app.pro index eda1be9..a64f9f0 100644 --- a/basicsuite/qtwebbrowser/app.pro +++ b/basicsuite/qtwebbrowser/app.pro @@ -4,8 +4,8 @@ include(../shared/shared.pri) b2qtdemo_deploy_defaults() content.files = \ - *.qml \ - *.png + main.qml + content.path = $$DESTPATH OTHER_FILES += $${content.files} diff --git a/basicsuite/shared/shared.pri b/basicsuite/shared/shared.pri index 6b5c535..bc1c222 100644 --- a/basicsuite/shared/shared.pri +++ b/basicsuite/shared/shared.pri @@ -16,7 +16,6 @@ HEADERS += $$PWD/engine.h defineTest(b2qtdemo_deploy_defaults) { commonFiles.files = \ - exclude.txt \ ../shared/SharedMain.qml commonFiles.path = $$DESTPATH OTHER_FILES += $${commonFiles.files} diff --git a/basicsuite/textinput/textinput.pro b/basicsuite/textinput/textinput.pro index b5b97b2..ed99be0 100644 --- a/basicsuite/textinput/textinput.pro +++ b/basicsuite/textinput/textinput.pro @@ -4,8 +4,12 @@ include(../shared/shared.pri) b2qtdemo_deploy_defaults() content.files = \ - *.qml \ - *.png + main.qml \ + ScrollBar.qml \ + TextArea.qml \ + TextBase.qml \ + TextField.qml + content.path = $$DESTPATH OTHER_FILES += $${content.files} |