diff options
| author | Kai Uwe Broulik <kde@privat.broulik.de> | 2015-06-01 11:14:04 +0200 |
|---|---|---|
| committer | Kai Uwe Broulik <kde@privat.broulik.de> | 2015-06-03 07:55:02 +0000 |
| commit | dd274a5455296fcfe8631c2c2c7271546e9547bc (patch) | |
| tree | 21b87d339eb3b97de1f662c33ed1df3695c8f844 /src/corelib/global/qnamespace.h | |
| parent | 933bf178aab88ab5df8a68cbf02611d6d8744b1b (diff) | |
Rename ReturnKey to EnterKey
This makes the terminology consistent with Sailfish OS and the QNX QPA.
The kImePlatformDataReturnKeyType in the iOS QPA is not changed to not
break compatibility. Also, improve documentation.
Change-Id: I2780de5b1e9277185ae1d4d9bbc67e36682fbfba
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com>
Diffstat (limited to 'src/corelib/global/qnamespace.h')
| -rw-r--r-- | src/corelib/global/qnamespace.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index 123e2edf0e..c6465ed087 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -1323,7 +1323,7 @@ public: ImAbsolutePosition = 0x400, ImTextBeforeCursor = 0x800, ImTextAfterCursor = 0x1000, - ImReturnKeyType = 0x2000, + ImEnterKeyType = 0x2000, ImPlatformData = 0x80000000, ImQueryInput = ImCursorRectangle | ImCursorPosition | ImSurroundingText | @@ -1363,15 +1363,15 @@ public: }; Q_DECLARE_FLAGS(InputMethodHints, InputMethodHint) - enum ReturnKeyType { - ReturnKeyDefault, - ReturnKeyEnter, - ReturnKeyDone, - ReturnKeyGo, - ReturnKeySend, - ReturnKeySearch, - ReturnKeyNext, - ReturnKeyPrevious + enum EnterKeyType { + EnterKeyDefault, + EnterKeyReturn, + EnterKeyDone, + EnterKeyGo, + EnterKeySend, + EnterKeySearch, + EnterKeyNext, + EnterKeyPrevious }; enum ToolButtonStyle { @@ -1697,7 +1697,7 @@ public: QT_Q_ENUM(InputMethodHint) QT_Q_ENUM(InputMethodQuery) QT_Q_FLAG(InputMethodHints) - QT_Q_ENUM(ReturnKeyType) + QT_Q_ENUM(EnterKeyType) QT_Q_FLAG(InputMethodQueries) QT_Q_FLAG(TouchPointStates) QT_Q_ENUM(ScreenOrientation) |