summaryrefslogtreecommitdiffstats
path: root/plugins/multimedia/gstreamer/qx11videosurface.h
diff options
context:
space:
mode:
authorAlex <qt-info@nokia.com>2009-11-20 17:49:54 +1000
committerAlex <qt-info@nokia.com>2009-11-20 17:49:54 +1000
commit083a8fa8eaeb34170acd0ade61984dcda6dafb61 (patch)
tree9bcb2d520fb72142befa64564b52b72b0029851a /plugins/multimedia/gstreamer/qx11videosurface.h
parent67deec2b5396bf67a83669a071c6720d8c50e279 (diff)
sync with master
Diffstat (limited to 'plugins/multimedia/gstreamer/qx11videosurface.h')
-rw-r--r--plugins/multimedia/gstreamer/qx11videosurface.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/plugins/multimedia/gstreamer/qx11videosurface.h b/plugins/multimedia/gstreamer/qx11videosurface.h
index 303d35fa58..0b6799c51b 100644
--- a/plugins/multimedia/gstreamer/qx11videosurface.h
+++ b/plugins/multimedia/gstreamer/qx11videosurface.h
@@ -42,8 +42,6 @@
#ifndef QX11VIDEOSURFACE_H
#define QX11VIDEOSURFACE_H
-#ifndef QT_NO_MULTIMEDIA
-
#include <QtGui/qwidget.h>
#include <QtMultimedia/qabstractvideosurface.h>
@@ -108,5 +106,3 @@ private:
};
#endif
-
-#endif