diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-18 12:09:02 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-18 12:09:02 (GMT) |
| commit | 99e1dc904eab4b38c90803f13d73f90b9c048920 (patch) | |
| tree | 84967abb98484d1e0de51ebe58b821d220aac5ac /src/gui | |
| parent | b3e3e9c917786288858eb8b33aa8fe7fa390091c (diff) | |
| parent | a4550c49e982aa0218ab7097b814678505f8482c (diff) | |
| download | Qt-99e1dc904eab4b38c90803f13d73f90b9c048920.zip Qt-99e1dc904eab4b38c90803f13d73f90b9c048920.tar.gz Qt-99e1dc904eab4b38c90803f13d73f90b9c048920.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team:
Check if the scene exists before attempting to set its focus item.
The "audioinput" multimedia example locks up the audio input/output
no audiodevices found using QAudioDeviceInfo::availableDevices on Ubuntu
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsitem.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index fbfd8e6..726d571 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -2181,7 +2181,7 @@ void QGraphicsItemPrivate::setVisibleHelper(bool newVisible, bool explicitly, bo } // Enable subfocus - if (newVisible) { + if (scene && newVisible) { QGraphicsItem *p = parent; bool done = false; while (p) { |