From fa8e1e71bb17efe2549d9e81768f19c065065fce Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 20 Oct 2017 10:33:26 +0200 Subject: DirectShow/MinGW: Compile with default WINVER/_WIN32_WINNT 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 Reviewed-by: Orgad Shaneh Reviewed-by: Liang Qi --- src/plugins/directshow/directshow.pro | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/plugins/directshow/directshow.pro b/src/plugins/directshow/directshow.pro index 2857f87d9..54d617166 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) -- cgit v1.2.3