diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-08-26 14:10:45 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-08-26 14:10:45 (GMT) |
| commit | 743117fa94b5e8807b0b9f9b16f2a712e6bfb47f (patch) | |
| tree | f5d6c4206af385c940e36d94b49c5480d5804dbb /src/3rdparty/phonon | |
| parent | 5ef11e48dd3bd8a6d51028128ee957aba27b0100 (diff) | |
| parent | 5be87d57602d72c225943f052783c1053cd3d81a (diff) | |
| download | Qt-743117fa94b5e8807b0b9f9b16f2a712e6bfb47f.zip Qt-743117fa94b5e8807b0b9f9b16f2a712e6bfb47f.tar.gz Qt-743117fa94b5e8807b0b9f9b16f2a712e6bfb47f.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/3rdparty/phonon')
| -rw-r--r-- | src/3rdparty/phonon/ds9/backend.h | 2 | ||||
| -rw-r--r-- | src/3rdparty/phonon/ds9/mediaobject.cpp | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/3rdparty/phonon/ds9/backend.h b/src/3rdparty/phonon/ds9/backend.h index 9b2c2a2..8b020c2 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 *Backend::directShowMutex(); + static QMutex *directShowMutex(); Q_SIGNALS: void objectDescriptionChanged(ObjectDescriptionType); diff --git a/src/3rdparty/phonon/ds9/mediaobject.cpp b/src/3rdparty/phonon/ds9/mediaobject.cpp index 579517f..e42dff9 100644 --- a/src/3rdparty/phonon/ds9/mediaobject.cpp +++ b/src/3rdparty/phonon/ds9/mediaobject.cpp @@ -21,9 +21,7 @@ along with this library. If not, see <http://www.gnu.org/licenses/>. #include <QtCore/QTime> #include <QtCore/QLibrary> -#ifndef Q_CC_MSVC #include <dshow.h> -#endif //Q_CC_MSVC #include <objbase.h> #include <initguid.h> #include <qnetwork.h> |