aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/builtins
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@qt.io>2018-08-30 11:03:49 +0200
committerKai Koehne <kai.koehne@qt.io>2018-09-06 14:32:25 +0000
commit69984c9d36086428a3d43418af19d53db043a785 (patch)
treefd20ce11f2d65787fd5982150180b9de884985b9 /src/imports/builtins
parent34c987cbd10971e4b5a00d08c6061b2f65967e56 (diff)
Update plugins.qmltypes
by running cd qtdeclarative/imports; for path in `find . -name Makefile -print`; do pushd `dirname $path`; make qmltypes; popd; done in the build directory. Local file paths in the command line were then edited out by hand. Task-number: QTBUG-70264 Change-Id: I931604aff6a779915708395e8b8dbdf659cbd637 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/imports/builtins')
-rw-r--r--src/imports/builtins/builtins.qmltypes6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/imports/builtins/builtins.qmltypes b/src/imports/builtins/builtins.qmltypes
index 53c5300685..f2179aaf7a 100644
--- a/src/imports/builtins/builtins.qmltypes
+++ b/src/imports/builtins/builtins.qmltypes
@@ -428,7 +428,8 @@ Module {
"WA_AlwaysStackOnTop": 128,
"WA_TabletTracking": 129,
"WA_ContentsMarginsRespectsSafeArea": 130,
- "WA_AttributeCount": 131
+ "WA_StyleSheetTarget": 131,
+ "WA_AttributeCount": 132
}
}
Enum {
@@ -1648,7 +1649,8 @@ Module {
"NoScrollPhase": 0,
"ScrollBegin": 1,
"ScrollUpdate": 2,
- "ScrollEnd": 3
+ "ScrollEnd": 3,
+ "ScrollMomentum": 4
}
}
Enum {