aboutsummaryrefslogtreecommitdiffstats
path: root/src/quicktemplates2/qquickcontainer.cpp
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-03-16 03:02:08 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-03-16 03:02:08 +0100
commit4a434b19c347a6014f42cbcf0f1493d689e579fc (patch)
treeb33cb6f0a59f01336d66b73bc30f822aa24e61aa /src/quicktemplates2/qquickcontainer.cpp
parente78843a23e1485abddf81e10c34048b7e0bd9eaa (diff)
parent8b78d9cea3091b0bd94d1ae0c71a000f8e7e1903 (diff)
Merge remote-tracking branch 'origin/5.12' into 5.13
Diffstat (limited to 'src/quicktemplates2/qquickcontainer.cpp')
-rw-r--r--src/quicktemplates2/qquickcontainer.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickcontainer.cpp b/src/quicktemplates2/qquickcontainer.cpp
index c4af6151..2c357f82 100644
--- a/src/quicktemplates2/qquickcontainer.cpp
+++ b/src/quicktemplates2/qquickcontainer.cpp
@@ -793,6 +793,7 @@ void QQuickContainer::setContentWidth(qreal width)
return;
d->contentWidth = width;
+ d->resizeContent();
emit contentWidthChanged();
}
@@ -832,6 +833,7 @@ void QQuickContainer::setContentHeight(qreal height)
return;
d->contentHeight = height;
+ d->resizeContent();
emit contentHeightChanged();
}