diff options
| author | Justin McPherson <justin.mcpherson@nokia.com> | 2010-01-15 04:12:40 (GMT) |
|---|---|---|
| committer | Justin McPherson <justin.mcpherson@nokia.com> | 2010-01-15 05:49:21 (GMT) |
| commit | f53271c1cac46ad63612e951e34ffae34328fec6 (patch) | |
| tree | 23e55263805e54f61d82b1fa35acd7a6f352d9c8 /demos | |
| parent | d2fa5b80d4f40ac67a7a74552390332551563466 (diff) | |
| download | Qt-f53271c1cac46ad63612e951e34ffae34328fec6.zip Qt-f53271c1cac46ad63612e951e34ffae34328fec6.tar.gz Qt-f53271c1cac46ad63612e951e34ffae34328fec6.tar.bz2 | |
Move QtMobility multimedia framework into Qt.
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/demos.pro | 2 | ||||
| -rw-r--r-- | demos/multimedia/multimedia.pro | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/demos/demos.pro b/demos/demos.pro index 5a9b6db..86553dc 100644 --- a/demos/demos.pro +++ b/demos/demos.pro @@ -55,6 +55,7 @@ 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 # install sources.files = README *.pro @@ -82,6 +83,7 @@ demos_sqlbrowser.subdir = sqlbrowser demos_undo.subdir = undo demos_qtdemo.subdir = qtdemo demos_mediaplayer.subdir = qmediaplayer +demos_multimedia.subdir = multimedia demos_browser.subdir = browser diff --git a/demos/multimedia/multimedia.pro b/demos/multimedia/multimedia.pro new file mode 100644 index 0000000..042650f --- /dev/null +++ b/demos/multimedia/multimedia.pro @@ -0,0 +1,4 @@ +TEMPLATE = subdirs +SUBDIRS = player + + |