From 7a02bcaad18d7aa133944a23f863c2f9efcbf5fe Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Fri, 17 Jan 2014 14:41:08 +0100 Subject: [PATCH] Replace win32-g++ with mingw scope Commit 773dd01 in qtbase introduced a general mingw platform scope, which is cleaner and more flexible than matching the spec name. (see 278152fff for a similar commit in qtbase). Change-Id: Ib46b9e83f690b0b26933b73764c7d7d4b031d792 Reviewed-by: Yoann Lopes --- src/plugins/directshow/camera/camera.pri | 2 +- src/plugins/directshow/directshow.pro | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/plugins/directshow/camera/camera.pri b/src/plugins/directshow/camera/camera.pri index 7081abd..2c0fe55 100644 --- a/src/plugins/directshow/camera/camera.pri +++ b/src/plugins/directshow/camera/camera.pri @@ -2,7 +2,7 @@ INCLUDEPATH += $$PWD DEFINES += QMEDIA_DIRECTSHOW_CAMERA -win32-g++: DEFINES += QT_NO_WMSDK +mingw: DEFINES += QT_NO_WMSDK win32: DEFINES += _CRT_SECURE_NO_WARNINGS diff --git a/src/plugins/directshow/directshow.pro b/src/plugins/directshow/directshow.pro index 97e72a1..4dad971 100644 --- a/src/plugins/directshow/directshow.pro +++ b/src/plugins/directshow/directshow.pro @@ -16,9 +16,7 @@ qtHaveModule(widgets) { DEFINES += HAVE_WIDGETS } -win32-g++ { - DEFINES += NO_DSHOW_STRSAFE -} +mingw: DEFINES += NO_DSHOW_STRSAFE !config_wmf: include(player/player.pri) include(camera/camera.pri) -- 2.7.4