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 | |
| parent | a3b6eabd45b452b98c5b7c45df8a332ad018b8f1 (diff) | |
Fix MinGW-w64 compilation
Change-Id: I812b53e822947a9f85d6523722c6a4f9e57e0426
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp | 4 | ||||
| -rw-r--r-- | src/multimedia/multimedia.pro | 1 | ||||
| -rw-r--r-- | src/plugins/directshow/camera/camera.pri | 2 | ||||
| -rw-r--r-- | src/plugins/directshow/player/vmr9videowindowcontrol.cpp | 3 |
4 files changed, 7 insertions, 3 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 diff --git a/src/plugins/directshow/camera/camera.pri b/src/plugins/directshow/camera/camera.pri index 9acd5e54d..83b681920 100644 --- a/src/plugins/directshow/camera/camera.pri +++ b/src/plugins/directshow/camera/camera.pri @@ -29,5 +29,5 @@ SOURCES += \ SOURCES += $$PWD/dsvideowidgetcontrol.cpp } -INCLUDEPATH += $(DXSDK_DIR)/include +*-msvc*:INCLUDEPATH += $(DXSDK_DIR)/include LIBS += -lstrmiids -ldmoguids -luuid -lmsdmo -lole32 -loleaut32 diff --git a/src/plugins/directshow/player/vmr9videowindowcontrol.cpp b/src/plugins/directshow/player/vmr9videowindowcontrol.cpp index a5b22ad87..821fa093e 100644 --- a/src/plugins/directshow/player/vmr9videowindowcontrol.cpp +++ b/src/plugins/directshow/player/vmr9videowindowcontrol.cpp @@ -43,6 +43,9 @@ #include "directshowglobal.h" +#include <QtGui/QPalette> +#include <QtWidgets/QWidget> + Vmr9VideoWindowControl::Vmr9VideoWindowControl(QObject *parent) : QVideoWindowControl(parent) , m_filter(com_new<IBaseFilter>(CLSID_VideoMixingRenderer9, IID_IBaseFilter)) |