diff options
| author | Justin McPherson <justin.mcpherson@nokia.com> | 2009-08-05 14:26:56 +1000 |
|---|---|---|
| committer | Justin McPherson <justin.mcpherson@nokia.com> | 2009-08-05 14:26:56 +1000 |
| commit | e7052de274f6a201be628441d144dbbef5868948 (patch) | |
| tree | 2456ce91e33a13d49666213e722a12f32d196e0a /src/plugins | |
| parent | bd51c3010e78925a2074122b281de53f01be9ef9 (diff) | |
| download | qt4-tools-e7052de274f6a201be628441d144dbbef5868948.tar.gz | |
Merge AudioServices into mainline.
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/audio/audio.pro | 3 | ||||
| -rw-r--r-- | src/plugins/plugins.pro | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/audio/audio.pro b/src/plugins/audio/audio.pro new file mode 100644 index 0000000000..e93b369687 --- /dev/null +++ b/src/plugins/audio/audio.pro @@ -0,0 +1,3 @@ +TEMPLATE = subdirs + +#SUBDIRS += ossaudio diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index cf4edf1b13..45669e41ea 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -10,3 +10,4 @@ unix { embedded:SUBDIRS *= gfxdrivers decorations mousedrivers kbddrivers !win32:!embedded:!mac:SUBDIRS *= inputmethods contains(QT_CONFIG, phonon): SUBDIRS *= phonon +contains(QT_CONFIG, multimedia): SUBDIRS *= audio |