slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replace win32-g++ with mingw scope

Browse Source 
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>
This commit is contained in:
Kai Koehne
2014-01-17 14:41:08 +01:00
committed by The Qt Project
parent e4035bf6d0
commit 7a02bcaad1
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/directshow/camera/camera.pri
View File

@@ -2,7 +2,7 @@ INCLUDEPATH += $$PWD
DEFINES += QMEDIA_DIRECTSHOW_CAMERA DEFINES += QMEDIA_DIRECTSHOW_CAMERA
win32-g++: DEFINES += QT_NO_WMSDK mingw: DEFINES += QT_NO_WMSDK
win32: DEFINES += _CRT_SECURE_NO_WARNINGS win32: DEFINES += _CRT_SECURE_NO_WARNINGS

4
src/plugins/directshow/directshow.pro
View File

@@ -16,9 +16,7 @@ qtHaveModule(widgets) {
DEFINES += HAVE_WIDGETS DEFINES += HAVE_WIDGETS
} }
win32-g++ { mingw: DEFINES += NO_DSHOW_STRSAFE
DEFINES += NO_DSHOW_STRSAFE
}
!config_wmf: include(player/player.pri) !config_wmf: include(player/player.pri)
include(camera/camera.pri) include(camera/camera.pri)