diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-01 13:06:10 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-01 13:06:10 (GMT) |
| commit | a1c89baa7d88a4a662ccd2fdb3381844fa116365 (patch) | |
| tree | 429df46495c6af3a7d3096dc1465c3a0f0c44b97 /src/3rdparty | |
| parent | 64ca7030df6189a0bc4df36473befd868c8d2ef6 (diff) | |
| parent | d785467dbb97d4be9de66504dd6fb891da19abff (diff) | |
| download | Qt-a1c89baa7d88a4a662ccd2fdb3381844fa116365.zip Qt-a1c89baa7d88a4a662ccd2fdb3381844fa116365.tar.gz Qt-a1c89baa7d88a4a662ccd2fdb3381844fa116365.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
fix crash in Phonon::DS9 backend
Don't crash when running Qt on KDE with Oxygen style.
Fixes missing update when setting opacity on an item that had opacity 0.0
Avoids missing opacity updates by not propagating the ignoreOpacity flag
Cleanup in graphicsitem autotest
Adds convenience functions QGraphicsItemPrivate::isOpacityNull
Fixed a crash when QPixmaps are destroyed after the ~QApplication.
Fix GL texture leaks when pixmaps are deleted
Doc fix. No need to put something deprecated if it's not.
Warn if the plugin seems to not exist instead of simply passing.
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/phonon/ds9/videowidget.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/3rdparty/phonon/ds9/videowidget.cpp b/src/3rdparty/phonon/ds9/videowidget.cpp index 091be16..95423c6 100644 --- a/src/3rdparty/phonon/ds9/videowidget.cpp +++ b/src/3rdparty/phonon/ds9/videowidget.cpp @@ -218,6 +218,9 @@ namespace Phonon if (toNative && m_noNativeRendererSupported) return current; //no switch here + if (!mediaObject()) + return current; + //firt we delete the renderer //initialization of the widgets for(int i = 0; i < FILTER_COUNT; ++i) { |