summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@digia.com>2014-01-17 14:41:08 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-07 14:22:26 +0100
commit7a02bcaad18d7aa133944a23f863c2f9efcbf5fe (patch)
treec1eff9215eb6344254b0bdd6e797a13c8fa8bdbf /src/plugins
parente4035bf6d01c2105f64b5d548ccea51c7a48ef8d (diff)
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 <yoann.lopes@digia.com>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/directshow/camera/camera.pri2
-rw-r--r--src/plugins/directshow/directshow.pro4
2 files changed, 2 insertions, 4 deletions
diff --git a/src/plugins/directshow/camera/camera.pri b/src/plugins/directshow/camera/camera.pri
index 7081abd37..2c0fe55b1 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 97e72a107..4dad97113 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)