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

Merge demos and examples.

Browse Source 
Change-Id: I65ba412ef5207a71bf8763983b28672d1743f4b8
Reviewed-on: http://codereview.qt.nokia.com/1398
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
This commit is contained in:
Casper van Donderen
2011-07-11 09:56:57 +02:00
committed by Qt by Nokia
parent d5e75a3a49
commit ca4607979a
95 changed files with 8 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
qtmultimedia.pro
View File

@@ -3,14 +3,6 @@ TEMPLATE = subdirs
module_qtmultimedia_src.subdir = src
module_qtmultimedia_src.target = module-qtmultimedia-src
module_qtmultimedia_demos.subdir = demos
module_qtmultimedia_demos.target = module-qtmultimedia-demos
module_qtmultimedia_demos.depends = module_qtmultimedia_src
!contains(QT_BUILD_PARTS,demos) {
module_multimedia_demos.CONFIG += no_default_install no_default_target
}
module_qtmultimedia_examples.subdir = examples
module_qtmultimedia_examples.target = module-qtmultimedia-examples
module_qtmultimedia_examples.depends = module_qtmultimedia_src
@@ -26,6 +18,5 @@ module_qtmultimedia_tests.CONFIG = no_default_install
!contains(QT_BUILD_PARTS,tests):module_qtmultimedia_tests.CONFIG += no_default_target
SUBDIRS += module_qtmultimedia_src \
module_qtmultimedia_demos \
module_qtmultimedia_examples \
module_qtmultimedia_tests \