Replace win32-g++ with mingw scope
authorKai Koehne <kai.koehne@digia.com>
Fri, 17 Jan 2014 13:41:08 +0000 (14:41 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Fri, 7 Feb 2014 13:22:26 +0000 (14:22 +0100)
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>
src/plugins/directshow/camera/camera.pri
src/plugins/directshow/directshow.pro

index 7081abd..2c0fe55 100644 (file)
@@ -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
 
index 97e72a1..4dad971 100644 (file)
@@ -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)