From 7c787f11dd2348e0fd2cecc231f15a0acde7481a Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 13 Dec 2016 13:56:49 +0100 Subject: DirectShow: Port to new configure system (evr, wmsdk) Replace old legacy defines by QT_CONFIG. Fixes warnings when using MinGW: qtmultimedia/src/multimedia/qtmultimedia-config.h:4:0: warning: "QT_NO_WMSDK" redefined Change-Id: Ifbfc2cea3bf5bfd06d94fd70e6ea4afb6d6fbb4b Reviewed-by: Lars Knoll --- src/plugins/directshow/camera/camera.pri | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/plugins/directshow/camera') diff --git a/src/plugins/directshow/camera/camera.pri b/src/plugins/directshow/camera/camera.pri index fb7fbd3f5..afe77fc56 100644 --- a/src/plugins/directshow/camera/camera.pri +++ b/src/plugins/directshow/camera/camera.pri @@ -2,8 +2,6 @@ INCLUDEPATH += $$PWD DEFINES += QMEDIA_DIRECTSHOW_CAMERA -mingw: DEFINES += QT_NO_WMSDK - win32: DEFINES += _CRT_SECURE_NO_WARNINGS HEADERS += \ -- cgit v1.2.3 From 95de9e6154d75688e81a3b79007dfe6c56d3b65b Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Mon, 21 Nov 2016 10:44:47 +0100 Subject: Use QT_CONFIG macro to check for features And remove many custom defines. Change-Id: I658cc8430d1d99ed3c0aafe03a77adce76621a29 Reviewed-by: Yoann Lopes --- src/plugins/directshow/camera/camera.pri | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/plugins/directshow/camera') diff --git a/src/plugins/directshow/camera/camera.pri b/src/plugins/directshow/camera/camera.pri index afe77fc56..d8ee59aa9 100644 --- a/src/plugins/directshow/camera/camera.pri +++ b/src/plugins/directshow/camera/camera.pri @@ -1,7 +1,5 @@ INCLUDEPATH += $$PWD -DEFINES += QMEDIA_DIRECTSHOW_CAMERA - win32: DEFINES += _CRT_SECURE_NO_WARNINGS HEADERS += \ -- cgit v1.2.3