diff options
| author | Andrew den Exter <andrew.den-exter@nokia.com> | 2010-03-29 07:16:32 (GMT) |
|---|---|---|
| committer | Andrew den Exter <andrew.den-exter@nokia.com> | 2010-03-29 07:16:32 (GMT) |
| commit | e19d9a53afa0a50d0ca85a144add9d546aac5b39 (patch) | |
| tree | 875df2617850c2e064e506365ed3d698dc202f75 /src | |
| parent | ef4d44f7513bc69a33e3c0328d9f4ed856f6da57 (diff) | |
| parent | 8cbc9ff40c6b98a8ed488d5c6b86c58e90be6726 (diff) | |
| download | Qt-e19d9a53afa0a50d0ca85a144add9d546aac5b39.zip Qt-e19d9a53afa0a50d0ca85a144add9d546aac5b39.tar.gz Qt-e19d9a53afa0a50d0ca85a144add9d546aac5b39.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7
Diffstat (limited to 'src')
| -rw-r--r-- | src/multimedia/effects/effects.pri | 3 | ||||
| -rw-r--r-- | src/plugins/mediaservices/qt7/qt7movievideowidget.mm | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/multimedia/effects/effects.pri b/src/multimedia/effects/effects.pri index be2b696..6307255 100644 --- a/src/multimedia/effects/effects.pri +++ b/src/multimedia/effects/effects.pri @@ -5,7 +5,8 @@ unix:!mac { DEFINES += QT_MULTIMEDIA_PULSEAUDIO HEADERS += $$PWD/qsoundeffect_pulse_p.h SOURCES += $$PWD/qsoundeffect_pulse_p.cpp - LIBS += -lpulse + QMAKE_CXXFLAGS += $$QT_CFLAGS_PULSEAUDIO + LIBS += $$QT_LIBS_PULSEAUDIO } else { DEFINES += QT_MULTIMEDIA_QMEDIAPLAYER HEADERS += $$PWD/qsoundeffect_qmedia_p.h diff --git a/src/plugins/mediaservices/qt7/qt7movievideowidget.mm b/src/plugins/mediaservices/qt7/qt7movievideowidget.mm index c58d0a0..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) |