diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-11 16:21:42 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-11 16:21:42 +0200 |
| commit | 6a0bb9a7d6a6473920da74bb48c52a4eaed990b0 (patch) | |
| tree | 3a32c56b1fe21c96d5982511e0b4815c1c07dfbb /src/imports/builtins | |
| parent | f0d23d3ff9da26a71295a6abd356c8d366d17439 (diff) | |
| parent | 2746518c76e02c642ff29faf568de4de90216e58 (diff) | |
Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake
Change-Id: I4a91928610f79c8e21a05781953ffa41508c828a
Diffstat (limited to 'src/imports/builtins')
| -rw-r--r-- | src/imports/builtins/builtins.qmltypes | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/imports/builtins/builtins.qmltypes b/src/imports/builtins/builtins.qmltypes index 4ad103f8de..c783c63caf 100644 --- a/src/imports/builtins/builtins.qmltypes +++ b/src/imports/builtins/builtins.qmltypes @@ -131,6 +131,13 @@ Module { } } Enum { + name: "SplitBehavior" + values: { + "KeepEmptyParts": 0, + "SkipEmptyParts": 1 + } + } + Enum { name: "Alignment" values: { "AlignLeft": 1, @@ -466,7 +473,8 @@ Module { "AA_DontShowShortcutsInContextMenus": 28, "AA_CompressTabletEvents": 29, "AA_DisableWindowContextHelpButton": 30, - "AA_AttributeCount": 31 + "AA_DisableSessionManager": 31, + "AA_AttributeCount": 32 } } Enum { @@ -1081,7 +1089,8 @@ Module { values: { "PlainText": 0, "RichText": 1, - "AutoText": 2 + "AutoText": 2, + "MarkdownText": 3 } } Enum { |