diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2024-12-16 11:54:40 +0100 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2024-12-18 20:37:27 +0100 |
| commit | ae7a573fe9d74f8d8355ca95f66ba160fa176270 (patch) | |
| tree | 8957c88a3dea4406fb1f06b74adb6c34787436ae /tests/auto/qml/qmlcppcodegen/tst_qmlcppcodegen.cpp | |
| parent | 7c968ac1512b8eede38f213708f314701547c784 (diff) | |
Compute implicitSize based on implicitContentSize in Pane and subclasses
Now that Pane reflects its explicitly set contentWidth/Height through
implicitContentWidth/Height we can use the same expression for implicit
width/height as regular controls, which hooks us into the safe area
binding loop detection as well.
Pick-to: 6.9
Change-Id: Ie31b740a1e405341fc5f0ed9673b213292e4afd9
Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io>
Diffstat (limited to 'tests/auto/qml/qmlcppcodegen/tst_qmlcppcodegen.cpp')
| -rw-r--r-- | tests/auto/qml/qmlcppcodegen/tst_qmlcppcodegen.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qml/qmlcppcodegen/tst_qmlcppcodegen.cpp b/tests/auto/qml/qmlcppcodegen/tst_qmlcppcodegen.cpp index 58bbfa751f..8c11487793 100644 --- a/tests/auto/qml/qmlcppcodegen/tst_qmlcppcodegen.cpp +++ b/tests/auto/qml/qmlcppcodegen/tst_qmlcppcodegen.cpp @@ -3218,7 +3218,7 @@ void tst_QmlCppCodegen::lotsOfRegisters() const qreal implicitBackgroundWidth = object->property("implicitBackgroundWidth").toDouble(); const qreal leftInset = object->property("leftInset").toDouble(); const qreal rightInset = object->property("rightInset").toDouble(); - const qreal contentWidth = object->property("contentWidth").toDouble(); + const qreal implicitContentWidth = object->property("implicitContentWidth").toDouble(); const qreal leftPadding = object->property("leftPadding").toDouble(); const qreal rightPadding = object->property("rightPadding").toDouble(); const qreal implicitFooterWidth = object->property("implicitFooterWidth").toDouble(); @@ -3226,7 +3226,7 @@ void tst_QmlCppCodegen::lotsOfRegisters() const qreal implicitWidth = object->property("implicitWidth").toDouble(); QCOMPARE(implicitWidth, qMax(qMax(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding), + implicitContentWidth + leftPadding + rightPadding), qMax(implicitHeaderWidth, implicitFooterWidth))); }; |