summaryrefslogtreecommitdiff
path: root/config.tests
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2016-03-21 14:26:15 +0100
committerLiang Qi <liang.qi@theqtcompany.com>2016-03-21 14:26:22 +0100
commite757890f4a5669b396039211902224f31666725a (patch)
treebb220ff8b9d8d4a64ce5f197a4b39e3e5965da63 /config.tests
parentcaf0cbca71231dbb6403108ba41d2117d3ce6c6d (diff)
parent71a6b1b62041981f894cb2b6589fce92f137bbc4 (diff)
downloadqtmultimedia-e757890f4a5669b396039211902224f31666725a.tar.gz
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ieb1a3081907093e31e8c8b7f95993bb3b2173672
Diffstat (limited to 'config.tests')
-rw-r--r--config.tests/alsa/alsatest.cpp2
-rw-r--r--config.tests/directshow/directshow.pro2
-rw-r--r--config.tests/directshow/main.cpp2
3 files changed, 4 insertions, 2 deletions
diff --git a/config.tests/alsa/alsatest.cpp b/config.tests/alsa/alsatest.cpp
index 5ee77f2ac..ea511cd21 100644
--- a/config.tests/alsa/alsatest.cpp
+++ b/config.tests/alsa/alsatest.cpp
@@ -27,7 +27,7 @@
****************************************************************************/
#include <alsa/asoundlib.h>
-#if (!(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 10)))
+#if SND_LIB_VERSION < 0x1000a // 1.0.10
#error "Alsa version found too old, require >= 1.0.10"
#endif
diff --git a/config.tests/directshow/directshow.pro b/config.tests/directshow/directshow.pro
index 6493e54ab..6dfc54a01 100644
--- a/config.tests/directshow/directshow.pro
+++ b/config.tests/directshow/directshow.pro
@@ -3,4 +3,4 @@ CONFIG += console
SOURCES += main.cpp
-LIBS += -lstrmiids -ldmoguids -luuid -lmsdmo -lole32 -loleaut32
+!wince: LIBS += -lstrmiids -ldmoguids -luuid -lmsdmo -lole32 -loleaut32
diff --git a/config.tests/directshow/main.cpp b/config.tests/directshow/main.cpp
index 25e36f966..bb9a304ec 100644
--- a/config.tests/directshow/main.cpp
+++ b/config.tests/directshow/main.cpp
@@ -27,8 +27,10 @@
****************************************************************************/
#include <dshow.h>
+#ifndef _WIN32_WCE
#include <d3d9.h>
#include <vmr9.h>
+#endif
int main(int, char**)
{