Fix MinGW-w64 compilation

Change-Id: I812b53e822947a9f85d6523722c6a4f9e57e0426
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

diff --git a/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp b/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
index 51af363..b4174a5 100644 (file)
--- 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 8239b3b..82b58e9 100644 (file)
--- 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 9acd5e5..83b6819 100644 (file)
--- 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 a5b22ad..821fa09 100644 (file)
--- 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))