diff options
| author | Andrew den Exter <andrew.den-exter@nokia.com> | 2010-04-16 06:03:10 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-04-16 06:11:06 (GMT) |
| commit | e524de33ce765344908d61350b78178dc358432b (patch) | |
| tree | 7c0a2b4601a3792b0113eb58f827bdaa0e43a6eb | |
| parent | 4402d3ab051eb6f3f064bc7d2bcac64d811c52ea (diff) | |
| download | Qt-e524de33ce765344908d61350b78178dc358432b.zip Qt-e524de33ce765344908d61350b78178dc358432b.tar.gz Qt-e524de33ce765344908d61350b78178dc358432b.tar.bz2 | |
Fix compile errors in Direct Show media service.
The service links against the multimedia library in addition to the
mediaservices libarary, and QAbstractVideoSurface is defined in
QtMultimedia, no QtMediaServices.
(cherry picked from commit 9471428742ba59dbb174fc275742052e4bb629ff)
| -rw-r--r-- | src/plugins/mediaservices/directshow/directshow.pro | 2 | ||||
| -rw-r--r-- | src/plugins/mediaservices/directshow/mediaplayer/mediasamplevideobuffer.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/mediaservices/directshow/directshow.pro b/src/plugins/mediaservices/directshow/directshow.pro index 973c2b1..065e391 100644 --- a/src/plugins/mediaservices/directshow/directshow.pro +++ b/src/plugins/mediaservices/directshow/directshow.pro @@ -1,7 +1,7 @@ TARGET = qdsengine include(../../qpluginbase.pri) -QT += mediaservices +QT += multimedia mediaservices HEADERS += dsserviceplugin.h SOURCES += dsserviceplugin.cpp diff --git a/src/plugins/mediaservices/directshow/mediaplayer/mediasamplevideobuffer.h b/src/plugins/mediaservices/directshow/mediaplayer/mediasamplevideobuffer.h index 1b3776d..06dc31c 100644 --- a/src/plugins/mediaservices/directshow/mediaplayer/mediasamplevideobuffer.h +++ b/src/plugins/mediaservices/directshow/mediaplayer/mediasamplevideobuffer.h @@ -42,7 +42,7 @@ #ifndef MEDIASAMPLEVIDEOBUFFER_H #define MEDIASAMPLEVIDEOBUFFER_H -#include <QtMediaServices/qabstractvideobuffer.h> +#include <QtMultimedia/qabstractvideobuffer.h> #include <dshow.h> |