diff options
| author | Markku Heikkila <markku.heikkila@digia.com> | 2012-02-02 09:54:13 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-25 07:42:31 (GMT) |
| commit | 90b71dc0ff4ec9bb150a0de9933d6eb06d995a34 (patch) | |
| tree | 4bb731a33831d1046d3303e65b221a69593b706a /src/gui | |
| parent | 053baa018fa6ffe663c646246b8ba2253327cbd6 (diff) | |
| download | Qt-90b71dc0ff4ec9bb150a0de9933d6eb06d995a34.zip Qt-90b71dc0ff4ec9bb150a0de9933d6eb06d995a34.tar.gz Qt-90b71dc0ff4ec9bb150a0de9933d6eb06d995a34.tar.bz2 | |
Fix infinite recursion while dragging toolbar of QMainWindow.
Prevent recursion in QMainWindowLayout::endSeparatorMove().
Task-number: QTBUG-21378
Change-Id: Ie40005a35918d4da7ef911f8c3b1d1c3b5cf4fd2
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/widgets/qmainwindowlayout.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/widgets/qmainwindowlayout.cpp b/src/gui/widgets/qmainwindowlayout.cpp index 2f765a4..cae4070 100644 --- a/src/gui/widgets/qmainwindowlayout.cpp +++ b/src/gui/widgets/qmainwindowlayout.cpp @@ -1368,10 +1368,11 @@ bool QMainWindowLayout::separatorMove(const QPoint &pos) bool QMainWindowLayout::endSeparatorMove(const QPoint&) { - bool result = !movingSeparator.isEmpty(); + if (movingSeparator.isEmpty()) + return false; movingSeparator.clear(); savedState.clear(); - return result; + return true; } void QMainWindowLayout::raise(QDockWidget *widget) |