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/gsttools/qvideosurfacegstsink.cpp | |
| 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/gsttools/qvideosurfacegstsink.cpp')
| -rw-r--r-- | src/gsttools/qvideosurfacegstsink.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gsttools/qvideosurfacegstsink.cpp b/src/gsttools/qvideosurfacegstsink.cpp index 545c37ead..ce69d78b3 100644 --- a/src/gsttools/qvideosurfacegstsink.cpp +++ b/src/gsttools/qvideosurfacegstsink.cpp @@ -49,8 +49,7 @@ #include <private/qmediapluginloader_p.h> #include "qgstvideobuffer_p.h" -#if defined(Q_WS_X11) && !defined(QT_NO_XVIDEO) -#include <QtWidgets/qx11info_x11.h> +#if defined(HAVE_XVIDEO) #include "qgstxvimagebuffer_p.h" #endif @@ -77,7 +76,7 @@ QVideoSurfaceGstDelegate::QVideoSurfaceGstDelegate( m_pools.append(plugin); } } -#if defined(Q_WS_X11) && !defined(QT_NO_XVIDEO) +#ifdef HAVE_XVIDEO m_pools.append(new QGstXvImageBufferPool()); #endif updateSupportedFormats(); |