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

@@ -1,27 +1,16 @@
TEMPLATE = app
TARGET = qmlvideofx
SOURCES += filereader.cpp \
main.cpp
HEADERS += filereader.h \
trace.h
LOCAL_SOURCES = filereader.cpp main.cpp
LOCAL_HEADERS = filereader.h trace.h
SOURCES += $$LOCAL_SOURCES
HEADERS += $$LOCAL_HEADERS
RESOURCES += qmlvideofx.qrc
qml_folder.source = qml/qmlvideofx
qml_folder.target = qml
DEPLOYMENTFOLDERS += qml_folder
images_folder.source = images
images_folder.target =
DEPLOYMENTFOLDERS += images_folder
shaders_folder.source = shaders
shaders_folder.target =
DEPLOYMENTFOLDERS += shaders_folder
SNIPPETS_PATH = ../snippets
include($$SNIPPETS_PATH/performancemonitor/performancemonitordeclarative.pri)
performanceItemAddDeployment()
maemo6: {
DEFINES += SMALL_SCREEN_LAYOUT
@@ -29,4 +18,9 @@ maemo6: {
}
include(qmlapplicationviewer/qmlapplicationviewer.pri)
qtcAddDeployment()
# install
target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/video/qmlvideofx
sources.files = $$LOCAL_SOURCES $$LOCAL_HEADERS $$RESOURCES *.pro images qmlapplicationviewer qmlvideofx.png shaders qml qmlvideofx.svg
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/video/qmlvideofx
INSTALLS += target sources