Prepare for removal of Softkeys API

Change-Id: I28f0d1b66da10a9d578e3aea3fe73a5d28322852
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>

diff --git a/src/imports/qtquick2/plugins.qmltypes b/src/imports/qtquick2/plugins.qmltypes
index 19400aa..015d2ac 100644 (file)
--- 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