diff options
| author | Marco Benelli <marco.benelli@qt.io> | 2016-09-08 17:32:46 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2016-09-12 17:21:01 +0000 |
| commit | d98c282554a83be015af742957580a6bf7dd4c68 (patch) | |
| tree | 7dcd1bc18c0defa6746d91ec2ed1f40f9281ca9d /src/imports/builtins/builtins.qmltypes | |
| parent | cd77297bd97bdd70d9526fb9c54ebcca8c081def (diff) | |
Update .qmltypes
Update qmltypes for 5.8.
For some files the -noforceqtquick option is used; in this way
there are no redundand definitions of QtQuick component and no
unneded dependencies from QtQuick.
Change-Id: Id29683fcd6d15056923867ea65b091f998297fc4
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/imports/builtins/builtins.qmltypes')
| -rw-r--r-- | src/imports/builtins/builtins.qmltypes | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/src/imports/builtins/builtins.qmltypes b/src/imports/builtins/builtins.qmltypes index cca1c20d54..88e3ac6634 100644 --- a/src/imports/builtins/builtins.qmltypes +++ b/src/imports/builtins/builtins.qmltypes @@ -198,9 +198,7 @@ Module { "MacWindowToolBarButtonHint": 268435456, "BypassGraphicsProxyWidget": 536870912, "NoDropShadowWindowHint": 1073741824, - "WindowFullscreenButtonHint": -2147483648, - "WindowOkButtonHint": 524288, - "WindowCancelButtonHint": 1048576 + "WindowFullscreenButtonHint": -2147483648 } } Enum { @@ -243,9 +241,7 @@ Module { "MacWindowToolBarButtonHint": 268435456, "BypassGraphicsProxyWidget": 536870912, "NoDropShadowWindowHint": 1073741824, - "WindowFullscreenButtonHint": -2147483648, - "WindowOkButtonHint": 524288, - "WindowCancelButtonHint": 1048576 + "WindowFullscreenButtonHint": -2147483648 } } Enum { @@ -422,6 +418,7 @@ Module { "AA_DontShowIconsInMenus": 2, "AA_NativeWindows": 3, "AA_DontCreateNativeWidgetSiblings": 4, + "AA_PluginApplication": 5, "AA_MacPluginApplication": 5, "AA_DontUseNativeMenuBar": 6, "AA_MacDontSwapCtrlAndMeta": 7, @@ -438,7 +435,12 @@ Module { "AA_SetPalette": 19, "AA_EnableHighDpiScaling": 20, "AA_DisableHighDpiScaling": 21, - "AA_AttributeCount": 22 + "AA_UseStyleSheetPropagationInWidgetStyles": 22, + "AA_DontUseNativeDialogs": 23, + "AA_SynthesizeMouseForUnhandledTabletEvents": 24, + "AA_CompressHighFrequencyEvents": 25, + "AA_DontCheckOpenGLContextThreadAffinity": 26, + "AA_AttributeCount": 27 } } Enum { @@ -1274,8 +1276,10 @@ Module { "ImTextBeforeCursor": 2048, "ImTextAfterCursor": 4096, "ImEnterKeyType": 8192, + "ImAnchorRectangle": 16384, + "ImInputItemClipRectangle": 32768, "ImPlatformData": -2147483648, - "ImQueryInput": 186, + "ImQueryInput": 16570, "ImQueryAll": -1 } } @@ -1297,8 +1301,10 @@ Module { "ImTextBeforeCursor": 2048, "ImTextAfterCursor": 4096, "ImEnterKeyType": 8192, + "ImAnchorRectangle": 16384, + "ImInputItemClipRectangle": 32768, "ImPlatformData": -2147483648, - "ImQueryInput": 186, + "ImQueryInput": 16570, "ImQueryAll": -1 } } @@ -1579,6 +1585,7 @@ Module { Enum { name: "ScrollPhase" values: { + "NoScrollPhase": 0, "ScrollBegin": 1, "ScrollUpdate": 2, "ScrollEnd": 3 |