diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2019-09-05 11:08:59 +0200 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-09-05 11:08:59 +0200 |
commit | 2746518c76e02c642ff29faf568de4de90216e58 (patch) | |
tree | 822a6d979c13b6450c221b2a45ccfb6674bcb8e4 /src/imports/builtins | |
parent | 9e32b23a1514f367921b4a9ee25bc864a008463c (diff) | |
parent | bdf0a46c289298f7378796d62ae5fb283e08657d (diff) |
Merge remote-tracking branch 'origin/dev' into wip/qt6
Conflicts:
.qmake.conf
src/qml/qml/qqmlengine.cpp
src/qmlmodels/qqmlmodelsmodule.cpp
Change-Id: Id60420f8250a9c97fcfe56d4eea19b62c6870404
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 { |