diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2009-08-26 09:26:53 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2009-08-26 12:38:31 (GMT) |
| commit | a49d181c2700123a0c9af922c86b89914b402e9d (patch) | |
| tree | b5244ef834764d0ca0b59870e832dd294a8a54ba /src/3rdparty | |
| parent | e3742c782d71ded65f007d6bb4401504f8369ac6 (diff) | |
| download | Qt-a49d181c2700123a0c9af922c86b89914b402e9d.zip Qt-a49d181c2700123a0c9af922c86b89914b402e9d.tar.gz Qt-a49d181c2700123a0c9af922c86b89914b402e9d.tar.bz2 | |
Compile fix for mingw
Diffstat (limited to 'src/3rdparty')
| -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> |