diff options
| author | Jonas Rabbe <jonas.rabbe@nokia.com> | 2011-12-09 11:45:11 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-13 01:22:28 +0100 |
| commit | 4f3294930af1ea4350bc8dd5225afd17591f16cd (patch) | |
| tree | 9d941147930f09cf568884030783a0a4dbaff11e /src/plugins/gstreamer/mediacapture | |
| parent | 9d526fca670ba90c8ad433f60bd94f9b9975e18d (diff) | |
Fix X11 and QPA compilation problems
The X11 buffer pool was using outdated APIs, and as the 'qpa'
configuration value is being removed, it caused the X11 code
to be pulled in, and therefore cause compilation failures.
Change-Id: I5fdaed854c6525716fccca44b5fbd0b850880cb9
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Diffstat (limited to 'src/plugins/gstreamer/mediacapture')
| -rw-r--r-- | src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.cpp b/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.cpp index f10fd58a7..f1516885a 100644 --- a/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.cpp +++ b/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.cpp @@ -100,7 +100,7 @@ QGstreamerCaptureService::QGstreamerCaptureService(const QString &service, QObje m_videoRenderer = new QGstreamerVideoRenderer(this); -#if defined(Q_WS_X11) && !defined(QT_NO_XVIDEO) +#ifdef HAVE_XVIDEO m_videoWindow = new QGstreamerVideoOverlay(this); m_videoWidgetControl = new QGstreamerVideoWidgetControl(this); #endif |