diff options
| author | aavit <qt-info@nokia.com> | 2010-03-31 12:00:03 (GMT) |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2010-03-31 12:00:03 (GMT) |
| commit | 85313fec454f77322deb7041726573e14f6a262a (patch) | |
| tree | e0151a738a3acc91e16411869e160042e63bbc9a /src/plugins/mediaservices/qt7/qt7movievideowidget.mm | |
| parent | 2fe059c863377befdcf65084a07a7f4841beef0d (diff) | |
| parent | 93ae014d7ee06a6ebb701420fffef5895cd731c4 (diff) | |
| download | Qt-85313fec454f77322deb7041726573e14f6a262a.zip Qt-85313fec454f77322deb7041726573e14f6a262a.tar.gz Qt-85313fec454f77322deb7041726573e14f6a262a.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'src/plugins/mediaservices/qt7/qt7movievideowidget.mm')
| -rw-r--r-- | src/plugins/mediaservices/qt7/qt7movievideowidget.mm | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/plugins/mediaservices/qt7/qt7movievideowidget.mm b/src/plugins/mediaservices/qt7/qt7movievideowidget.mm index 197c26e..648d6b4 100644 --- a/src/plugins/mediaservices/qt7/qt7movievideowidget.mm +++ b/src/plugins/mediaservices/qt7/qt7movievideowidget.mm @@ -73,7 +73,8 @@ public: void initializeGL() { - glClearColor(0.0f, 0.0f, 0.0f, 1.0f); + QColor bgColor = palette().color(QPalette::Background); + glClearColor(bgColor.redF(), bgColor.greenF(), bgColor.blueF(), bgColor.alphaF()); } void resizeGL(int w, int h) @@ -279,10 +280,6 @@ void QT7MovieVideoWidget::setupVideoOutput() m_displayLink->start(); } -void QT7MovieVideoWidget::setEnabled(bool) -{ -} - void QT7MovieVideoWidget::setMovie(void *movie) { if (m_movie == movie) |