diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-19 10:19:49 +0200 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-19 10:19:49 +0200 |
| commit | de0858687898f6e0e54cce3f986779c7aa1a350e (patch) | |
| tree | db90ba9785f4492dac7971bbc060be81605b6802 /demos/demos.pro | |
| parent | 85611635a3589d56c2670445ea5272e864e57a98 (diff) | |
| parent | 650fefd7e25b10d88048d2a465a27c479d80636d (diff) | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
removed test file, part of mediaservice removal.
Rebuild configure.exe
Rebuild configure following the removal of media services.
More mediaservices removal work.
Removed mediaservices.
Diffstat (limited to 'demos/demos.pro')
| -rw-r--r-- | demos/demos.pro | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/demos/demos.pro b/demos/demos.pro index b174135c45..f359bd71d4 100644 --- a/demos/demos.pro +++ b/demos/demos.pro @@ -57,7 +57,6 @@ wince*:SUBDIRS += demos_sqlbrowser } contains(QT_CONFIG, phonon):!static:SUBDIRS += demos_mediaplayer contains(QT_CONFIG, webkit):contains(QT_CONFIG, svg):!symbian:SUBDIRS += demos_browser -contains(QT_CONFIG, multimedia):SUBDIRS += demos_multimedia contains(QT_CONFIG, declarative):SUBDIRS += demos_declarative contains(QT_CONFIG, multimedia):SUBDIRS += demos_spectrum @@ -90,7 +89,6 @@ demos_sqlbrowser.subdir = sqlbrowser demos_undo.subdir = undo demos_qtdemo.subdir = qtdemo demos_mediaplayer.subdir = qmediaplayer -demos_multimedia.subdir = multimedia demos_declarative.subdir = declarative demos_browser.subdir = browser |