Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-alpha1

Conflicts:
	.qmake.conf

Change-Id: Ibd5f6052bd07152fbe344505308563d9857771e9

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);