aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@qt.io>2018-04-18 17:02:45 +0200
committerKai Koehne <kai.koehne@qt.io>2018-04-20 06:46:21 +0000
commit7bd77083032c6414f23b994617fb907be32f4d83 (patch)
treeaccff3d0bc88a6f4bc8b02147cba82f43519847a
parent61b6180c02202921245569c1a1278be6942d6ec6 (diff)
Update builtins.qmltypes
Change-Id: I2e08061ff7d084b08d1fb6d857dc6fb985c66a48 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
-rw-r--r--src/imports/builtins/builtins.qmltypes39
1 files changed, 37 insertions, 2 deletions
diff --git a/src/imports/builtins/builtins.qmltypes b/src/imports/builtins/builtins.qmltypes
index 5fb68d15d9..53c5300685 100644
--- a/src/imports/builtins/builtins.qmltypes
+++ b/src/imports/builtins/builtins.qmltypes
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.2
// It is used for QML tooling purposes only.
//
// This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable -builtins'
+// 'qmlplugindump -builtins'
Module {
dependencies: []
@@ -427,7 +427,8 @@ Module {
"WA_MacNoShadow": 127,
"WA_AlwaysStackOnTop": 128,
"WA_TabletTracking": 129,
- "WA_AttributeCount": 130
+ "WA_ContentsMarginsRespectsSafeArea": 130,
+ "WA_AttributeCount": 131
}
}
Enum {
@@ -760,6 +761,36 @@ Module {
"Key_Dead_Belowdot": 16781920,
"Key_Dead_Hook": 16781921,
"Key_Dead_Horn": 16781922,
+ "Key_Dead_Stroke": 16781923,
+ "Key_Dead_Abovecomma": 16781924,
+ "Key_Dead_Abovereversedcomma": 16781925,
+ "Key_Dead_Doublegrave": 16781926,
+ "Key_Dead_Belowring": 16781927,
+ "Key_Dead_Belowmacron": 16781928,
+ "Key_Dead_Belowcircumflex": 16781929,
+ "Key_Dead_Belowtilde": 16781930,
+ "Key_Dead_Belowbreve": 16781931,
+ "Key_Dead_Belowdiaeresis": 16781932,
+ "Key_Dead_Invertedbreve": 16781933,
+ "Key_Dead_Belowcomma": 16781934,
+ "Key_Dead_Currency": 16781935,
+ "Key_Dead_a": 16781952,
+ "Key_Dead_A": 16781953,
+ "Key_Dead_e": 16781954,
+ "Key_Dead_E": 16781955,
+ "Key_Dead_i": 16781956,
+ "Key_Dead_I": 16781957,
+ "Key_Dead_o": 16781958,
+ "Key_Dead_O": 16781959,
+ "Key_Dead_u": 16781960,
+ "Key_Dead_U": 16781961,
+ "Key_Dead_Small_Schwa": 16781962,
+ "Key_Dead_Capital_Schwa": 16781963,
+ "Key_Dead_Greek": 16781964,
+ "Key_Dead_Lowline": 16781968,
+ "Key_Dead_Aboveverticalline": 16781969,
+ "Key_Dead_Belowverticalline": 16781970,
+ "Key_Dead_Longsolidusoverlay": 16781971,
"Key_Back": 16777313,
"Key_Forward": 16777314,
"Key_Stop": 16777315,
@@ -1348,6 +1379,8 @@ Module {
"ImhTime": 256,
"ImhPreferLatin": 512,
"ImhMultiLine": 1024,
+ "ImhNoEditMenu": 2048,
+ "ImhNoTextHandles": 4096,
"ImhDigitsOnly": 65536,
"ImhFormattedNumbersOnly": 131072,
"ImhUppercaseOnly": 262144,
@@ -1374,6 +1407,8 @@ Module {
"ImhTime": 256,
"ImhPreferLatin": 512,
"ImhMultiLine": 1024,
+ "ImhNoEditMenu": 2048,
+ "ImhNoTextHandles": 4096,
"ImhDigitsOnly": 65536,
"ImhFormattedNumbersOnly": 131072,
"ImhUppercaseOnly": 262144,