diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-11 08:53:58 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-11 08:53:58 +0100 |
| commit | d5ab3ab8703ef04cc06d78983bf1a39ecfe99bb4 (patch) | |
| tree | 33e55f0cba22d73a7207b6237156daca1dcd624e /src/plugins/directshow | |
| parent | 0cb4dc5c1fded81b4f47945b51b8de0b0151bf67 (diff) | |
| parent | d3a2d9c96994c56d67467c131b8f080510d1a8fd (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
qtmultimedia.pro
src/multimedia/playback/qmediaplayer.cpp
src/plugins/directshow/directshow.pro
tests/auto/integration/qmediaplayerbackend/BLACKLIST
Change-Id: I6dacdcbb223c1d12dd72eb308a67170983c709b3
Diffstat (limited to 'src/plugins/directshow')
| -rw-r--r-- | src/plugins/directshow/directshow.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/directshow/directshow.pro b/src/plugins/directshow/directshow.pro index 10c6fe2b6..918a14210 100644 --- a/src/plugins/directshow/directshow.pro +++ b/src/plugins/directshow/directshow.pro @@ -13,7 +13,7 @@ SOURCES += dsserviceplugin.cpp mingw: DEFINES += NO_DSHOW_STRSAFE include(helpers/helpers.pri) -!config_wmf: include(player/player.pri) +!config_wmf|!contains(QT_CONFIG, wmf-backend): include(player/player.pri) include(camera/camera.pri) OTHER_FILES += \ |