diff options
| author | Jerome Pasion <jerome.pasion@digia.com> | 2012-11-02 14:59:56 +0100 |
|---|---|---|
| committer | Jerome Pasion <jerome.pasion@digia.com> | 2012-11-02 15:02:08 +0100 |
| commit | 47c45bb1e487b3823281683c1110d9269f144582 (patch) | |
| tree | 4c687d46d9aa7d90f064a25e6c7f0241ae28e16d /src/imports/qtquick2/plugins.qmltypes | |
| parent | 677be9a27770ff48dd771ec4fc1c66139aac4aa8 (diff) | |
| parent | 7d94fa8e074ba816751c60bd0ad3c63b3c0b0a27 (diff) | |
Merge branch 'master' of ssh://codereview.qt-project.org/qt/qtdeclarative into newdocs
Change-Id: Icced038fbdb309d8928213d3753a27fe5a6b1137
Diffstat (limited to 'src/imports/qtquick2/plugins.qmltypes')
| -rw-r--r-- | src/imports/qtquick2/plugins.qmltypes | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/imports/qtquick2/plugins.qmltypes b/src/imports/qtquick2/plugins.qmltypes index 19400aa4f0..015d2ac139 100644 --- a/src/imports/qtquick2/plugins.qmltypes +++ b/src/imports/qtquick2/plugins.qmltypes @@ -3871,9 +3871,7 @@ Module { "MacWindowToolBarButtonHint": 268435456, "BypassGraphicsProxyWidget": 536870912, "WindowOkButtonHint": 524288, - "WindowCancelButtonHint": 1048576, - "WindowSoftkeysVisibleHint": 1073741824, - "WindowSoftkeysRespondHint": -2147483648 + "WindowCancelButtonHint": 1048576 } } Enum { @@ -3912,9 +3910,7 @@ Module { "MacWindowToolBarButtonHint": 268435456, "BypassGraphicsProxyWidget": 536870912, "WindowOkButtonHint": 524288, - "WindowCancelButtonHint": 1048576, - "WindowSoftkeysVisibleHint": 1073741824, - "WindowSoftkeysRespondHint": -2147483648 + "WindowCancelButtonHint": 1048576 } } Enum { @@ -4068,8 +4064,6 @@ Module { "WA_AcceptTouchEvents": 121, "WA_WState_AcceptedTouchBeginEvent": 122, "WA_TouchPadAcceptSingleTouchEvents": 123, - "WA_MergeSoftkeys": 124, - "WA_MergeSoftkeysRecursively": 125, "WA_X11DoNotAcceptFocus": 126, "WA_MacNoShadow": 127, "WA_AttributeCount": 128 |