aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/builtins/builtins.qmltypes
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2019-08-21 18:04:04 +0200
committerUlf Hermann <ulf.hermann@qt.io>2019-08-26 17:56:43 +0200
commit6b3f5442641ee53dffc5b7e8ea8679d66668d114 (patch)
tree0910b11a01643c152b800bd4a3d5b499bde1ae80 /src/imports/builtins/builtins.qmltypes
parent69dcabed60208c6e6226b52332bf4ab5b107130d (diff)
Regenerate plugins.qmltypes
Change-Id: I9e470d08ee93c44663e6f99cebe7817c90cba3e4 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/imports/builtins/builtins.qmltypes')
-rw-r--r--src/imports/builtins/builtins.qmltypes13
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 {