diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-19 18:37:26 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-19 18:37:26 +0100 |
commit | 852f4e4cf87d7db0eaa87384b1589e151f76e6cd (patch) | |
tree | 73bc838da6bde8b66e26c2e1a34ff319584edf82 /src/designer/src/components | |
parent | 863a6621d14caf67adcf3f30cb955a268765f0f1 (diff) | |
parent | 98eebb2dc1830b262d72e748817aee25e54d0d35 (diff) | |
download | qttools-852f4e4cf87d7db0eaa87384b1589e151f76e6cd.tar.gz |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-alpha1
Conflicts:
.qmake.conf
Change-Id: Ibd5f6052bd07152fbe344505308563d9857771e9
Diffstat (limited to 'src/designer/src/components')
-rw-r--r-- | src/designer/src/components/formeditor/formwindow.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/designer/src/components/formeditor/formwindow.cpp b/src/designer/src/components/formeditor/formwindow.cpp index d51090553..3d09740ad 100644 --- a/src/designer/src/components/formeditor/formwindow.cpp +++ b/src/designer/src/components/formeditor/formwindow.cpp @@ -2182,8 +2182,6 @@ void FormWindow::layoutContainer(QWidget *w, int type) w = core()->widgetFactory()->containerOfWidget(w); const QObjectList l = w->children(); - if (l.isEmpty()) - return; // find managed widget children QWidgetList widgets; const QObjectList::const_iterator ocend = l.constEnd(); @@ -2194,6 +2192,9 @@ void FormWindow::layoutContainer(QWidget *w, int type) widgets.append(widget); } + if (widgets.isEmpty()) // QTBUG-50563, observed when using hand-edited forms. + return; + LayoutCommand *cmd = new LayoutCommand(this); cmd->init(mainContainer(), widgets, static_cast<LayoutInfo::Type>(type), w); clearSelection(false); |