summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaurice Kalinowski <maurice.kalinowski@digia.com>2012-11-20 13:10:46 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-20 14:53:46 +0100
commitc671cf25b2a0a52eeeb4ade7ff0d5d81a5d61a94 (patch)
tree570e5625fa0dc7b15c5c5e396b9783b128db0d0c
parent1761c93ea875070cce61269aa5ebb1912da7ee79 (diff)
downloadqtmultimedia-c671cf25b2a0a52eeeb4ade7ff0d5d81a5d61a94.tar.gz
simplified example
- do not use any opengl additions inside this simple example - also fixes problems in relation to mixing angle with GLWidgets Task-number: QTBUG-27963 Change-Id: I69a966b886cd8b3e88d6f3be48463eee59baa58a Reviewed-by: hjk <qthjk@ovi.com>
-rw-r--r--examples/videographicsitem/videographicsitem.pro2
-rw-r--r--examples/videographicsitem/videoplayer.cpp8
2 files changed, 0 insertions, 10 deletions
diff --git a/examples/videographicsitem/videographicsitem.pro b/examples/videographicsitem/videographicsitem.pro
index a0a3cdc74..c90383570 100644
--- a/examples/videographicsitem/videographicsitem.pro
+++ b/examples/videographicsitem/videographicsitem.pro
@@ -3,8 +3,6 @@ TARGET = videographicsitem
QT += multimedia multimediawidgets
-contains(QT_CONFIG, opengl): QT += opengl
-
HEADERS += videoplayer.h
SOURCES += main.cpp \
diff --git a/examples/videographicsitem/videoplayer.cpp b/examples/videographicsitem/videoplayer.cpp
index 4cf1c082c..b202673e8 100644
--- a/examples/videographicsitem/videoplayer.cpp
+++ b/examples/videographicsitem/videoplayer.cpp
@@ -44,10 +44,6 @@
#include <qvideosurfaceformat.h>
#include <qgraphicsvideoitem.h>
-#if !defined(QT_NO_OPENGL)
-# include <QtOpenGL/QGLWidget>
-#endif
-
VideoPlayer::VideoPlayer(QWidget *parent, Qt::WindowFlags flags)
: QWidget(parent, flags)
, mediaPlayer(0, QMediaPlayer::VideoSurface)
@@ -61,10 +57,6 @@ VideoPlayer::VideoPlayer(QWidget *parent, Qt::WindowFlags flags)
QGraphicsScene *scene = new QGraphicsScene(this);
QGraphicsView *graphicsView = new QGraphicsView(scene);
-#if !defined(QT_NO_OPENGL)
- graphicsView->setViewport(new QGLWidget);
-#endif
-
scene->addItem(videoItem);
QSlider *rotateSlider = new QSlider(Qt::Horizontal);