diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-04-20 20:46:46 +0200 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@qt.io> | 2016-04-28 12:25:31 +0000 |
| commit | 6dc5ff99ac02a5ed2c716a011c06eee766d125de (patch) | |
| tree | 16e1ca1627c7b624c087fad4224a51d7aec28724 /examples | |
| parent | 20528da413e68cbff9d2eb1da3257c0e0025b4cd (diff) | |
fix example installs
Change-Id: I9daec1e1ec1bc163d451ac03685ef6caba7dbde7
Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/multimedia/spectrum/3rdparty/fftreal/fftreal.pro | 1 | ||||
| -rw-r--r-- | examples/multimedia/spectrum/app/app.pro | 2 | ||||
| -rw-r--r-- | examples/multimedia/spectrum/spectrum.pro | 3 | ||||
| -rw-r--r-- | examples/multimedia/video/qmlvideo/qmlvideo.pro | 3 | ||||
| -rw-r--r-- | examples/multimedia/video/qmlvideofx/qmlvideofx.pro | 4 | ||||
| -rw-r--r-- | examples/multimedia/video/video.pro | 3 |
6 files changed, 16 insertions, 0 deletions
diff --git a/examples/multimedia/spectrum/3rdparty/fftreal/fftreal.pro b/examples/multimedia/spectrum/3rdparty/fftreal/fftreal.pro index f6abeeb15..b2c96f96c 100644 --- a/examples/multimedia/spectrum/3rdparty/fftreal/fftreal.pro +++ b/examples/multimedia/spectrum/3rdparty/fftreal/fftreal.pro @@ -42,3 +42,4 @@ EXAMPLE_FILES = bwins/fftreal.def eabi/fftreal.def readme.txt license.txt target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/spectrum INSTALLS += target +CONFIG += install_ok # Do not cargo-cult this! diff --git a/examples/multimedia/spectrum/app/app.pro b/examples/multimedia/spectrum/app/app.pro index 8262372c4..76aa02cdf 100644 --- a/examples/multimedia/spectrum/app/app.pro +++ b/examples/multimedia/spectrum/app/app.pro @@ -57,6 +57,8 @@ RESOURCES = spectrum.qrc target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/spectrum INSTALLS += target +CONFIG += install_ok # Do not cargo-cult this! + # Deployment DESTDIR = ..$${spectrum_build_dir} diff --git a/examples/multimedia/spectrum/spectrum.pro b/examples/multimedia/spectrum/spectrum.pro index 81006a24c..0ca2ee554 100644 --- a/examples/multimedia/spectrum/spectrum.pro +++ b/examples/multimedia/spectrum/spectrum.pro @@ -10,3 +10,6 @@ SUBDIRS += app TARGET = spectrum +EXAMPLE_FILES += \ + README.txt \ + TODO.txt diff --git a/examples/multimedia/video/qmlvideo/qmlvideo.pro b/examples/multimedia/video/qmlvideo/qmlvideo.pro index 26865c59a..022835f12 100644 --- a/examples/multimedia/video/qmlvideo/qmlvideo.pro +++ b/examples/multimedia/video/qmlvideo/qmlvideo.pro @@ -16,3 +16,6 @@ include($$SNIPPETS_PATH/performancemonitor/performancemonitordeclarative.pri) target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/video/qmlvideo INSTALLS += target +EXAMPLE_FILES += \ + qmlvideo.png \ + qmlvideo.svg diff --git a/examples/multimedia/video/qmlvideofx/qmlvideofx.pro b/examples/multimedia/video/qmlvideofx/qmlvideofx.pro index e9633954c..4221d157b 100644 --- a/examples/multimedia/video/qmlvideofx/qmlvideofx.pro +++ b/examples/multimedia/video/qmlvideofx/qmlvideofx.pro @@ -19,3 +19,7 @@ OTHER_FILES += \ android/AndroidManifest.xml QMAKE_INFO_PLIST = Info.plist + +EXAMPLE_FILES += \ + qmlvideofx.png \ + qmlvideofx.svg diff --git a/examples/multimedia/video/video.pro b/examples/multimedia/video/video.pro index 3127a4e49..f38cbc124 100644 --- a/examples/multimedia/video/video.pro +++ b/examples/multimedia/video/video.pro @@ -2,3 +2,6 @@ TEMPLATE = subdirs SUBDIRS += qmlvideo qmlvideofx +EXAMPLE_FILES += \ + qmlvideofilter_opencl \ # FIXME: this one should use a configure check instead + snippets |