slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix building of examples.

Browse Source 
- 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
Download Patch File Download Diff File Expand all files Collapse all files

24
examples/video/qmlvideo/qmlvideo.pro
View File

@@ -1,21 +1,21 @@
TEMPLATE = app
TARGET = qmlvideo
SOURCES += main.cpp
HEADERS += trace.h
LOCAL_SOURCES = main.cpp
LOCAL_HEADERS = trace.h
SOURCES += $$LOCAL_SOURCES
HEADERS += $$LOCAL_HEADERS
RESOURCES += qmlvideo.qrc
qml_folder.source = qml/qmlvideo
qml_folder.target = qml
DEPLOYMENTFOLDERS = qml_folder
images_folder.source = images
images_folder.target =
DEPLOYMENTFOLDERS += images_folder
SNIPPETS_PATH = ../snippets
include($$SNIPPETS_PATH/performancemonitor/performancemonitordeclarative.pri)
performanceItemAddDeployment()
include(qmlapplicationviewer/qmlapplicationviewer.pri)
qtcAddDeployment()
# install
target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/video/qmlvideo
sources.files = $$LOCAL_SOURCES $$LOCAL_HEADERS $$RESOURCES *.pro images qmlapplicationviewer qmlvideo.png qml qmlvideo.svg
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/video/qmlvideo
INSTALLS += target sources