Merge branch 'stable' into dev

Conflicts: .qmake.conf Change-Id: Id3427cb1a80956ba61373313c21b4b9aa007ea54
2013-08-05 10:38:25 +02:00
parent ab29837c0e 2838a99c5a
commit 06eab796ba
36 changed files with 62 additions and 25 deletions
--- a/qtmultimedia.pro
+++ b/qtmultimedia.pro
@@ -7,7 +7,7 @@ win32 {
    qtCompileTest(directshow)
    qtCompileTest(wmsdk)
    qtCompileTest(wmp)
-    qtCompileTest(wmf)
+    contains(QT_CONFIG, wmf-backend): qtCompileTest(wmf)
    qtCompileTest(evr)
 } else:mac {
    qtCompileTest(avfoundation)