Fix crash when trying to place toolbar into zero-height window.
authorFriedemann Kleint <Friedemann.Kleint@digia.com>
Fri, 28 Mar 2014 14:55:31 +0000 (15:55 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Thu, 10 Apr 2014 08:04:21 +0000 (10:04 +0200)
commit68a911862e05400ced87971c43fb27fb5d5d8ebd
tree49e504ed63f8a903fae2daf8c5f9a08a77ea44e4
parentb510e64cc5405c0664200bf471b5ccbbe3b4d081
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>
(cherry picked from qtbase/e38ad9455099a83e2a8619f19ca949bc64ae6f82)
src/gui/widgets/qmainwindowlayout.cpp
src/gui/widgets/qtoolbararealayout.cpp
src/gui/widgets/qtoolbararealayout_p.h