summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2017-10-20 10:33:26 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2017-10-20 12:03:26 +0000
commitfa8e1e71bb17efe2549d9e81768f19c065065fce (patch)
tree8656647d2ff1895ef885d58906b79de3b194213b
parent6b5b4d4ab4806812eaa4f6ddc78831ad31d0e7d9 (diff)
DirectShow/MinGW: Compile with default WINVER/_WIN32_WINNTv5.10.0-beta3
The multimedia headers of MinGW 5.3/7.1 are too broken to compile with 0x0601 introduced by qtbase/d57a7c41712f8627a462d893329dc3f0dbb52d32. Task-number: QTBUG-63905 Change-Id: Ibe6a70bf7431f095121c9179bb4a3d03191c03e2 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Liang Qi <liang.qi@qt.io>
-rw-r--r--src/plugins/directshow/directshow.pro8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/plugins/directshow/directshow.pro b/src/plugins/directshow/directshow.pro
index 2857f87d..54d61716 100644
--- a/src/plugins/directshow/directshow.pro
+++ b/src/plugins/directshow/directshow.pro
@@ -8,7 +8,13 @@ win32:!qtHaveModule(opengl)|qtConfig(dynamicgl) {
HEADERS += dsserviceplugin.h
SOURCES += dsserviceplugin.cpp
-mingw: DEFINES += NO_DSHOW_STRSAFE
+# Remove WINVER/_WIN32_WINNT definitions added to qt_build_config.prf
+# by qtbase/d57a7c41712f8627a462d893329dc3f0dbb52d32 since the multimedia
+# headers of MinGW 5.3/7.1 are too broken to compile with 0x0601.
+mingw {
+ DEFINES -= WINVER=0x0601 _WIN32_WINNT=0x0601
+ DEFINES += NO_DSHOW_STRSAFE
+}
include(common/common.pri)
qtConfig(directshow-player): include(player/player.pri)