diff options
| author | Alexis Menard <alexis.menard@nokia.com> | 2009-10-20 08:28:49 (GMT) |
|---|---|---|
| committer | Alexis Menard <alexis.menard@nokia.com> | 2009-10-20 08:28:49 (GMT) |
| commit | 1a11cc88e8516097e73d7aefc44c9a97ea0b5aef (patch) | |
| tree | 0d1e57ee49db51982083f1fbdba19f5f852f9bf4 /src/gui/kernel/qapplication.cpp | |
| parent | eeac9aa8d51b11f3040dcf818cec0a58cd0898f0 (diff) | |
| parent | 93550050f4fe4f411bfbd80d7b30ff5bc8a20df7 (diff) | |
| download | Qt-1a11cc88e8516097e73d7aefc44c9a97ea0b5aef.zip Qt-1a11cc88e8516097e73d7aefc44c9a97ea0b5aef.tar.gz Qt-1a11cc88e8516097e73d7aefc44c9a97ea0b5aef.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-widget-team into 4.6
Diffstat (limited to 'src/gui/kernel/qapplication.cpp')
| -rw-r--r-- | src/gui/kernel/qapplication.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp index 6f6d706..41d8098 100644 --- a/src/gui/kernel/qapplication.cpp +++ b/src/gui/kernel/qapplication.cpp @@ -2662,7 +2662,10 @@ void QApplicationPrivate::dispatchEnterLeave(QWidget* enter, QWidget* leave) { if (!isAlien(w)) break; if (w->testAttribute(Qt::WA_SetCursor)) { - parentOfLeavingCursor = w->parentWidget(); + QWidget *parent = w->parentWidget(); + while (parent && parent->d_func()->data.in_destructor) + parent = parent->parentWidget(); + parentOfLeavingCursor = parent; //continue looping, we need to find the downest alien widget with a cursor. // (downest on the screen) } |