diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-12-12 09:48:13 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-12-12 10:27:59 +0100 |
| commit | 533759ef333e4db8625cd02f763994788da01199 (patch) | |
| tree | dcb4b4ec8882b42ce8213f4e309534dd8d234843 /src/plugins/directshow/directshow.pro | |
| parent | 31ed506ea2c7a8be439d77e02ca0d67b6f9ce675 (diff) | |
| parent | 7bc230386e0d8d6f3c4ad5a0a6a22a625c9a8327 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
src/plugins/gstreamer/mediacapture/qgstreameraudioencode.cpp
Change-Id: I7c30c2d13fdd07ee07e4449d5d3e256e988d3793
Diffstat (limited to 'src/plugins/directshow/directshow.pro')
| -rw-r--r-- | src/plugins/directshow/directshow.pro | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/directshow/directshow.pro b/src/plugins/directshow/directshow.pro index 10c6fe2b6..5eb4fbc96 100644 --- a/src/plugins/directshow/directshow.pro +++ b/src/plugins/directshow/directshow.pro @@ -1,19 +1,19 @@ TARGET = dsengine +QT += multimedia-private + win32:!qtHaveModule(opengl)|qtConfig(dynamicgl) { LIBS_PRIVATE += -lgdi32 -luser32 } -QT += multimedia-private - HEADERS += dsserviceplugin.h SOURCES += dsserviceplugin.cpp -!config_wmsdk: DEFINES += QT_NO_WMSDK +!qtConfig(wmsdk): DEFINES += QT_NO_WMSDK mingw: DEFINES += NO_DSHOW_STRSAFE include(helpers/helpers.pri) -!config_wmf: include(player/player.pri) +!qtConfig(wmf-backend): include(player/player.pri) include(camera/camera.pri) OTHER_FILES += \ |