diff options
author | Justin McPherson <justin.mcpherson@nokia.com> | 2010-05-27 16:22:28 +1000 |
---|---|---|
committer | Justin McPherson <justin.mcpherson@nokia.com> | 2010-05-27 16:22:28 +1000 |
commit | defa75854c008dc21b89c6c04d1fbd9985912a98 (patch) | |
tree | cf0614c7fc55c3e5b2d128aee0993c9c01208aa0 /plugins/multimedia/gstreamer/qx11videosurface.h | |
parent | 0af10930d7dc0bddcc8608db01d18d210b1b56f6 (diff) |
Merge 1.0->module.
Diffstat (limited to 'plugins/multimedia/gstreamer/qx11videosurface.h')
-rw-r--r-- | plugins/multimedia/gstreamer/qx11videosurface.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/plugins/multimedia/gstreamer/qx11videosurface.h b/plugins/multimedia/gstreamer/qx11videosurface.h index f816a3e296..2f9c132cb5 100644 --- a/plugins/multimedia/gstreamer/qx11videosurface.h +++ b/plugins/multimedia/gstreamer/qx11videosurface.h @@ -47,6 +47,8 @@ #ifndef QT_NO_XVIDEO +#ifndef QT_NO_XVIDEO + #include <X11/Xlib.h> #include <X11/extensions/Xv.h> #include <X11/extensions/Xvlib.h> |