AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed bug in QLayout::replaceWidget()

Browse Source 
If the \a to widget was already part of a layout it would be removed from
the layout. This happened because the function that was supposed to
perform this removal was called after we had done the replacement.
QLayout::addChildWidget() should therefore be called first.  This is also
documented in QLayout::addChildWidget()

Change-Id: Ie718935a14ebad81827fad962920e930263c05b8
Task-number: QTBUG-37724
Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
This commit is contained in:
Jan Arve Saether 2015-03-13 14:49:51 +01:00 committed by Jan Arve Sæther
parent 7dd5726380
commit d59638f21d
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/widgets/kernel/qlayout.cpp
View File

@ -1175,13 +1175,12 @@ QLayoutItem *QLayout::replaceWidget(QWidget *from, QWidget *to, Qt::FindChildOpt
if (index == -1) if (index == -1)
return 0; return 0;
addChildWidget(to);
QLayoutItem *newitem = new QWidgetItem(to); QLayoutItem *newitem = new QWidgetItem(to);
newitem->setAlignment(item->alignment()); newitem->setAlignment(item->alignment());
QLayoutItem *r = d->replaceAt(index, newitem); QLayoutItem *r = d->replaceAt(index, newitem);
if (!r) if (!r)
delete newitem; delete newitem;
else
addChildWidget(to);
return r; return r;
} }