From c671cf25b2a0a52eeeb4ade7ff0d5d81a5d61a94 Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Tue, 20 Nov 2012 13:10:46 +0100 Subject: 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 --- examples/videographicsitem/videographicsitem.pro | 2 -- examples/videographicsitem/videoplayer.cpp | 8 -------- 2 files changed, 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 #include -#if !defined(QT_NO_OPENGL) -# include -#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); -- cgit v1.2.1