summaryrefslogtreecommitdiff
path: root/qtmultimedia.pro
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-11-11 08:53:58 +0100
committerLiang Qi <liang.qi@qt.io>2016-11-11 08:53:58 +0100
commitd5ab3ab8703ef04cc06d78983bf1a39ecfe99bb4 (patch)
tree33e55f0cba22d73a7207b6237156daca1dcd624e /qtmultimedia.pro
parent0cb4dc5c1fded81b4f47945b51b8de0b0151bf67 (diff)
parentd3a2d9c96994c56d67467c131b8f080510d1a8fd (diff)
downloadqtmultimedia-d5ab3ab8703ef04cc06d78983bf1a39ecfe99bb4.tar.gz
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 'qtmultimedia.pro')
-rw-r--r--qtmultimedia.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/qtmultimedia.pro b/qtmultimedia.pro
index e7de1e703..c0a90bc56 100644
--- a/qtmultimedia.pro
+++ b/qtmultimedia.pro
@@ -8,7 +8,7 @@ win32 {
}
qtCompileTest(evr)
qtCompileTest(wmsdk)
- contains(QT_CONFIG, wmf-backend): qtCompileTest(wmf)
+ qtCompileTest(wmf)
qtCompileTest(wasapi)
} else:mac {
qtCompileTest(avfoundation)