diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-08-05 10:38:25 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-08-05 10:38:25 +0200 |
| commit | 06eab796bafa48c9e1a7e6c389bec84b8f42bd49 (patch) | |
| tree | 0db18767a303250e13d8291748595912d73be9e6 /qtmultimedia.pro | |
| parent | ab29837c0efd4c07e17bbc8a4e49a592218d924a (diff) | |
| parent | 2838a99c5abc78cb6ff1b4d4c5872ea4ddd5147e (diff) | |
| download | qtmultimedia-06eab796bafa48c9e1a7e6c389bec84b8f42bd49.tar.gz | |
Merge branch 'stable' into dev
Conflicts:
.qmake.conf
Change-Id: Id3427cb1a80956ba61373313c21b4b9aa007ea54
Diffstat (limited to 'qtmultimedia.pro')
| -rw-r--r-- | qtmultimedia.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qtmultimedia.pro b/qtmultimedia.pro index 593dff24f..d285c3cbc 100644 --- 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) |