diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-08-11 08:45:54 +1000 |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-08-11 08:45:54 +1000 |
| commit | 6bb93ab2fd79ae0a04c826d9027503b644b6e374 (patch) | |
| tree | 060d9765cf3f009c86fe6e421dac4ea8930d076e /src/gui/widgets/qtoolbararealayout.cpp | |
| parent | 40db84c97769141f3f2351de1b2d5c64904fe5c2 (diff) | |
| parent | 6c3c9d812a730d5bc1bcd6261befe077a65be594 (diff) | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/gui/widgets/qtoolbararealayout.cpp')
| -rw-r--r-- | src/gui/widgets/qtoolbararealayout.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/widgets/qtoolbararealayout.cpp b/src/gui/widgets/qtoolbararealayout.cpp index b4a0ef022..afd526af3 100644 --- a/src/gui/widgets/qtoolbararealayout.cpp +++ b/src/gui/widgets/qtoolbararealayout.cpp @@ -1156,8 +1156,8 @@ QLayoutItem *QToolBarAreaLayout::unplug(const QList<int> &path, QToolBarAreaLayo if (!next.skip()) { newExtraSpace = next.pos - previous.pos - pick(line.o, previous.sizeHint()); previous.resize(line.o, next.pos - previous.pos); + break; } - break; } break; } |