diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-31 16:05:25 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-31 17:38:37 +0100 |
| commit | 19b967506deea84a0d56375e5bcca48168a3cfc8 (patch) | |
| tree | bf488dc01069b7850cceff182c2241ed13db69c6 /src/imports/templates | |
| parent | 8318deb165047d592523ec0b2fd10510d4953b37 (diff) | |
| parent | 7fc567eda8a187e365f4c29c6e8f08440bf31218 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/templates/qquickpopup.cpp
src/templates/qquickpopup_p_p.h
src/templates/qquickspinbox_p.h
Change-Id: Ief25ad2d27410f62e90879f60499ed87359406c3
Diffstat (limited to 'src/imports/templates')
| -rw-r--r-- | src/imports/templates/plugins.qmltypes | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/imports/templates/plugins.qmltypes b/src/imports/templates/plugins.qmltypes index 67058870..d96563a7 100644 --- a/src/imports/templates/plugins.qmltypes +++ b/src/imports/templates/plugins.qmltypes @@ -357,9 +357,11 @@ Module { name: "ClosePolicy" values: { "NoAutoClose": 0, - "CloseOnPressOutside": 1, - "CloseOnReleaseOutside": 2, - "CloseOnEscape": 4 + "OnPressOutside": 1, + "OnPressOutsideParent": 2, + "OnReleaseOutside": 4, + "OnReleaseOutsideParent": 8, + "OnEscape": 16 } } Enum { @@ -386,6 +388,11 @@ Module { Property { name: "contentHeight"; type: "double" } Property { name: "availableWidth"; type: "double"; isReadonly: true } Property { name: "availableHeight"; type: "double"; isReadonly: true } + Property { name: "margins"; type: "double" } + Property { name: "topMargin"; type: "double" } + Property { name: "leftMargin"; type: "double" } + Property { name: "rightMargin"; type: "double" } + Property { name: "bottomMargin"; type: "double" } Property { name: "padding"; type: "double" } Property { name: "topPadding"; type: "double" } Property { name: "leftPadding"; type: "double" } |