Fix building of examples.

- Correct install paths
- Add missing resources
- Add declarative-radio
- Remove deploy/install logic from qmlapplicationviewer.pri and
  snippet .pro-files of the video examples and add normal install
  rules.

Task-number: QTBUG-27977

Change-Id: Iadecb14d9330c752f6fb739918da743a854ba236
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
This commit is contained in:
Friedemann Kleint
2012-11-22 13:00:50 +01:00
committed by The Qt Project
parent 5ef6db169e
commit d34f03c609
14 changed files with 55 additions and 322 deletions

View File

@@ -12,8 +12,8 @@ SOURCES += main.cpp \
videoplayer.cpp \
videoitem.cpp
target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/customvideoitem
target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/customvideosurface/customvideoitem
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/customvideoitem
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/customvideosurface/customvideoitem
INSTALLS += target sources

View File

@@ -1,3 +1,8 @@
TEMPLATE = subdirs
SUBDIRS += customvideoitem customvideowidget
# install
sources.files = customvideosurface.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/customvideosurface
INSTALLS += sources

View File

@@ -14,8 +14,8 @@ SOURCES = \
videowidget.cpp \
videowidgetsurface.cpp
target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/customvideowidget
target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/customvideosurface/customvideowidget
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/customvideowidget
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/customvideosurface/customvideowidget
INSTALLS += target sources