diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-30 16:10:13 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-30 15:26:48 +0000 |
| commit | fcb7cb051ce56bb913732501ab1271ef7738efba (patch) | |
| tree | b66dcf6cd7808b1801df8791b4c37c2333660ef7 /src/imports | |
| parent | d101dd653eae63797def798c05bbb7ff29739d68 (diff) | |
Update plugins.qmltypes
Change-Id: I1b7c15c57ca491561bf082ab53967455a6299529
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/controls/plugins.qmltypes | 13 | ||||
| -rw-r--r-- | src/imports/templates/plugins.qmltypes | 13 |
2 files changed, 20 insertions, 6 deletions
diff --git a/src/imports/controls/plugins.qmltypes b/src/imports/controls/plugins.qmltypes index d52c6153..75805fdd 100644 --- a/src/imports/controls/plugins.qmltypes +++ b/src/imports/controls/plugins.qmltypes @@ -363,9 +363,11 @@ Module { name: "ClosePolicy" values: { "NoAutoClose": 0, - "CloseOnPressOutside": 1, - "CloseOnReleaseOutside": 2, - "CloseOnEscape": 4 + "OnPressOutside": 1, + "OnPressOutsideParent": 2, + "OnReleaseOutside": 4, + "OnReleaseOutsideParent": 8, + "OnEscape": 16 } } Enum { @@ -392,6 +394,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" } 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" } |