diff options
| author | Markku Heikkila <markku.heikkila@digia.com> | 2012-06-08 13:32:58 +0300 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-25 19:04:56 +0200 |
| commit | 70758cbf15d7310c4bd57c66650848ad75fd08d7 (patch) | |
| tree | f9fc29256ba71a664be4cfbe6c33244aa803c33d /src | |
| parent | dfe7bdbe9c8dd95d1cd42f724c21b677086a4d95 (diff) | |
Fix infinite recursion while dragging toolbar of QMainWindow.
Prevent recursion in QMainWindowLayout::endSeparatorMove().
Manually cherry-picked from Qt 4.8 change
90b71dc0ff4ec9bb150a0de9933d6eb06d995a34
Task-number: QTBUG-21378
Change-Id: I901ebfd96be0bdc6ab03dd8c3335d2622db843db
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/widgets/widgets/qmainwindowlayout.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/widgets/widgets/qmainwindowlayout.cpp b/src/widgets/widgets/qmainwindowlayout.cpp index ff05503540..6446453a6b 100644 --- a/src/widgets/widgets/qmainwindowlayout.cpp +++ b/src/widgets/widgets/qmainwindowlayout.cpp @@ -1370,10 +1370,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) |