Make a plain Container calculate suitable implicit size

[ChangeLog][Controls][Container] A plain Container now calculates its
implicit size based on the implicit size of the content item plus
paddings, and the implicit size of the background item.

Change-Id: I0481aef0ce713d92bee8b119bf5158dea612d598
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

1 files changed, 1 insertions, 1 deletions

diff --git a/src/imports/controls/qtquickcontrols2plugin.cpp b/src/imports/controls/qtquickcontrols2plugin.cpp
index c2e27ba3..541d18d6 100644
--- a/src/imports/controls/qtquickcontrols2plugin.cpp
+++ b/src/imports/controls/qtquickcontrols2plugin.cpp
@@ -85,7 +85,6 @@ void QtQuickControls2Plugin::registerTypes(const char *uri)
     qmlRegisterType<QQuickAbstractButton>(uri, 2, 0, "AbstractButton");
     qmlRegisterType<QQuickButtonGroup>(uri, 2, 0, "ButtonGroup");
     qmlRegisterType<QQuickButtonGroupAttached>();
-    qmlRegisterType<QQuickContainer>(uri, 2, 0, "Container");
 
     QQuickStyleSelector selector;
     selector.setBaseUrl(typeUrl());
@@ -100,6 +99,7 @@ void QtQuickControls2Plugin::registerTypes(const char *uri)
     qmlRegisterType(selector.select(QStringLiteral("CheckBox.qml")), uri, 2, 0, "CheckBox");
     qmlRegisterType(selector.select(QStringLiteral("CheckDelegate.qml")), uri, 2, 0, "CheckDelegate");
     qmlRegisterType(selector.select(QStringLiteral("ComboBox.qml")), uri, 2, 0, "ComboBox");
+    qmlRegisterType(selector.select(QStringLiteral("Container.qml")), uri, 2, 0, "Container");
     qmlRegisterType(selector.select(QStringLiteral("Control.qml")), uri, 2, 0, "Control");
     qmlRegisterType(selector.select(QStringLiteral("Dial.qml")), uri, 2, 0, "Dial");
     qmlRegisterType(selector.select(QStringLiteral("Drawer.qml")), uri, 2, 0, "Drawer");