fix example installs

Change-Id: I9daec1e1ec1bc163d451ac03685ef6caba7dbde7 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
2016-04-20 20:46:46 +02:00
parent 20528da413
commit 6dc5ff99ac
6 changed files with 16 additions and 0 deletions
--- 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!
--- 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}
--- 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
--- 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
--- 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
--- 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