summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuca Carlon <carlon.luca@gmail.com>2018-07-21 11:47:51 +0200
committerLuca Carlon <carlon.luca@gmail.com>2018-07-28 10:39:55 +0000
commit899bc7654a1d56b3f12320d3ae04c8024282c034 (patch)
tree3d17b9f8f31627e77ca50ee1e178b062cb31da17
parentc4ded54241c92f3032e50e19654602b4706d04c8 (diff)
Build fix for DirectShow plugin when EVR is disabled
Fix compilation and link error when building the DirectShow plugin without EVR support. Change-Id: Ic14c4898e37739953c588e41c73e655350518457 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
-rw-r--r--src/plugins/directshow/player/directshowplayerservice.cpp2
-rw-r--r--src/plugins/directshow/player/player.pri2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/directshow/player/directshowplayerservice.cpp b/src/plugins/directshow/player/directshowplayerservice.cpp
index b975677a6..0cad3cc2e 100644
--- a/src/plugins/directshow/player/directshowplayerservice.cpp
+++ b/src/plugins/directshow/player/directshowplayerservice.cpp
@@ -61,6 +61,8 @@
#if QT_CONFIG(evr)
#include "directshowevrvideowindowcontrol.h"
+#else
+#include <mmreg.h>
#endif
#include "qmediacontent.h"
diff --git a/src/plugins/directshow/player/player.pri b/src/plugins/directshow/player/player.pri
index 9111cc545..ec1066db7 100644
--- a/src/plugins/directshow/player/player.pri
+++ b/src/plugins/directshow/player/player.pri
@@ -37,6 +37,8 @@ qtConfig(evr) {
SOURCES += \
$$PWD/directshowevrvideowindowcontrol.cpp
+} else {
+ LIBS += -lwinmm
}
qtConfig(wshellitem): \