diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-08-06 06:38:11 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-08-06 07:18:48 (GMT) |
| commit | 55c4f15df0d482c7d3d6c889b9fc132ed0bdd12a (patch) | |
| tree | 99c01d7a4e0941f415e9a48f51faac94787b6cb0 /src/plugins | |
| parent | 57ceb11ecf95032418712a686418116cf2398e7a (diff) | |
| parent | b008dfbd67176948f6fdf830dc99d23a538a6b9c (diff) | |
| download | Qt-55c4f15df0d482c7d3d6c889b9fc132ed0bdd12a.zip Qt-55c4f15df0d482c7d3d6c889b9fc132ed0bdd12a.tar.gz Qt-55c4f15df0d482c7d3d6c889b9fc132ed0bdd12a.tar.bz2 | |
Merge commit 'qt/master-stable'
Conflicts:
configure.exe
doc/src/classes/qnamespace.qdoc
examples/examples.pro
src/corelib/kernel/qcoreevent.cpp
src/corelib/kernel/qobject.cpp
src/gui/kernel/qapplication.cpp
src/gui/kernel/qstandardgestures.h
src/gui/kernel/qwidget.cpp
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 0000000..e93b369 --- /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 76056a32..004b816 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -11,3 +11,4 @@ embedded:SUBDIRS *= gfxdrivers decorations mousedrivers kbddrivers !win32:!embedded:!mac:!symbian:SUBDIRS *= inputmethods symbian:SUBDIRS += s60 contains(QT_CONFIG, phonon): SUBDIRS *= phonon +contains(QT_CONFIG, multimedia): SUBDIRS *= audio |