diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2014-03-28 15:55:31 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-09 20:53:06 +0200 |
| commit | e38ad9455099a83e2a8619f19ca949bc64ae6f82 (patch) | |
| tree | 5bf265e04708c06df91ac936c818b0a091b86c8e /src/widgets/widgets/qtoolbararealayout_p.h | |
| parent | 1a6410f91f5e5edf11508e19176123b54e474e83 (diff) | |
Fix crash when trying to place toolbar into zero-height window.
Change QToolBarAreaLayout::item() to return a pointer
and check return values in plug().
Task-number: QTBUG-37183
Change-Id: I7029eb9739cbe603460e87d3e5493f116bdb3a89
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Diffstat (limited to 'src/widgets/widgets/qtoolbararealayout_p.h')
| -rw-r--r-- | src/widgets/widgets/qtoolbararealayout_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/widgets/qtoolbararealayout_p.h b/src/widgets/widgets/qtoolbararealayout_p.h index ec7d1f26f1..6ba9768467 100644 --- a/src/widgets/widgets/qtoolbararealayout_p.h +++ b/src/widgets/widgets/qtoolbararealayout_p.h @@ -232,7 +232,7 @@ public: void remove(const QList<int> &path); void remove(QLayoutItem *item); void clear(); - QToolBarAreaLayoutItem &item(const QList<int> &path); + QToolBarAreaLayoutItem *item(const QList<int> &path); QRect itemRect(const QList<int> &path) const; QLayoutItem *plug(const QList<int> &path); QLayoutItem *unplug(const QList<int> &path, QToolBarAreaLayout *other); |