diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-18 14:20:15 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-18 14:20:15 (GMT) |
| commit | f6555ca5d188eef577da6aa21d8a5d28e094a33a (patch) | |
| tree | 1c91b3e753edb3534a5b82c367b2f237d2a0bd5d /src/3rdparty/phonon/ds9/backend.h | |
| parent | fb4e81bdc692efe0db9aa38dd2b941578c0f0370 (diff) | |
| parent | 7b41d3937c4521ba74b421da26d3a61a7aa4aa6e (diff) | |
| download | Qt-f6555ca5d188eef577da6aa21d8a5d28e094a33a.zip Qt-f6555ca5d188eef577da6aa21d8a5d28e094a33a.tar.gz Qt-f6555ca5d188eef577da6aa21d8a5d28e094a33a.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Conflicts:
configure.exe
Diffstat (limited to 'src/3rdparty/phonon/ds9/backend.h')
| -rw-r--r-- | src/3rdparty/phonon/ds9/backend.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/phonon/ds9/backend.h b/src/3rdparty/phonon/ds9/backend.h index 8b020c2..7c3c109 100644 --- a/src/3rdparty/phonon/ds9/backend.h +++ b/src/3rdparty/phonon/ds9/backend.h @@ -64,7 +64,7 @@ namespace Phonon Filter getAudioOutputFilter(int index) const; - static QMutex *directShowMutex(); + static QMutex *directShowMutex; Q_SIGNALS: void objectDescriptionChanged(ObjectDescriptionType); |