diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2017-12-14 15:12:00 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2017-12-14 18:07:04 +0000 |
commit | a31f0a1e7e187944eb8744c84c085f2e76752eb5 (patch) | |
tree | c8a86e0493a989fc91161a3f0367e77c2b7002c6 /tests/auto/customization/data/styles/simple/Frame.qml | |
parent | a60a28f8225709bfca338416630a0493853264e1 (diff) |
Extend and improve tst_customization
Add more test cases, and clarify the roles of the test styles.
- empty: no delegates at all
- incomplete: has all delegates, but with no bindings that access
delegates and therefore trigger creation (tests that delegates must
be created regardless)
- simple: has all delegates and creates bindings to simulate a full
style
- override: overrides the simple style and tests that the default
instances of overridden delegates are not created
There are still several non-popup controls that lack deferred
execution. These are marked with QEXPECT_FAIL() to make it easy
to track what's missing. This list still excludes all popups.
Task-number: QTBUG-50992
Change-Id: I70ce42592e7a320251edebfab3030ccc7c0eb978
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'tests/auto/customization/data/styles/simple/Frame.qml')
-rw-r--r-- | tests/auto/customization/data/styles/simple/Frame.qml | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/tests/auto/customization/data/styles/simple/Frame.qml b/tests/auto/customization/data/styles/simple/Frame.qml index 86e11810..5517f216 100644 --- a/tests/auto/customization/data/styles/simple/Frame.qml +++ b/tests/auto/customization/data/styles/simple/Frame.qml @@ -55,6 +55,16 @@ T.Frame { id: control objectName: "frame-simple" + implicitWidth: Math.max(background.implicitWidth, contentWidth) + implicitHeight: Math.max(background.implicitHeight, contentHeight) + + contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) + contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) + + contentItem: Item { + objectName: "frame-contentItem-simple" + } + background: Rectangle { objectName: "frame-background-simple" implicitWidth: 20 |