diff options
| author | Jonathan Liu <net147@gmail.com> | 2012-04-28 09:34:44 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-30 11:04:05 +0200 |
| commit | 641474ab101ebc6170d54706481fbb542cd53e48 (patch) | |
| tree | efba098e8d33d577b35a4ce0a8af7921e53eb53f /src/multimedia | |
| parent | a3b6eabd45b452b98c5b7c45df8a332ad018b8f1 (diff) | |
Fix MinGW-w64 compilation
Change-Id: I812b53e822947a9f85d6523722c6a4f9e57e0426
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/multimedia')
| -rw-r--r-- | src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp | 4 | ||||
| -rw-r--r-- | src/multimedia/multimedia.pro | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp b/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp index 51af36318..b4174a5af 100644 --- a/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp +++ b/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp @@ -56,7 +56,7 @@ #include "qaudiodeviceinfo_win32_p.h" #include <dshow.h> -#if defined(Q_CC_MINGW) +#if defined(Q_CC_MINGW) && !defined(__MINGW64_VERSION_MAJOR) extern GUID CLSID_AudioInputDeviceCategory; @@ -83,7 +83,7 @@ DECLARE_INTERFACE_(IPropertyBag, IUnknown) #endif /* __IPropertyBag_INTERFACE_DEFINED__ */ -#endif//Q_CC_MINGW +#endif // defined(Q_CC_MINGW) && !defined(__MINGW64_VERSION_MAJOR) QT_BEGIN_NAMESPACE diff --git a/src/multimedia/multimedia.pro b/src/multimedia/multimedia.pro index 8239b3b96..82b58e9f4 100644 --- a/src/multimedia/multimedia.pro +++ b/src/multimedia/multimedia.pro @@ -67,5 +67,6 @@ include(video/video.pri) mac { LIBS += -framework AppKit -framework QuartzCore -framework QTKit } +win32:LIBS += -luuid HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS |