summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@nokia.com>2009-09-08 07:34:01 (GMT)
committerJoerg Bornemann <joerg.bornemann@nokia.com>2009-09-08 07:34:01 (GMT)
commitb555f500f4ff2898b3dc7082590773132a1030f1 (patch)
tree6380d406e5bba62cc968c8eafe2ca724e67e40a2 /src
parent22e8dd8653281ebf79fc7fc0061b225c8daf2977 (diff)
parent74fd14a305ce7402890de1919c3a27ac4d1cbf38 (diff)
downloadQt-b555f500f4ff2898b3dc7082590773132a1030f1.zip
Qt-b555f500f4ff2898b3dc7082590773132a1030f1.tar.gz
Qt-b555f500f4ff2898b3dc7082590773132a1030f1.tar.bz2
Merge commit 'origin/4.5' into 4.6
Conflicts: src/gui/kernel/qapplication.cpp
Diffstat (limited to 'src')
-rw-r--r--src/gui/kernel/qapplication.cpp14
1 files changed, 12 insertions, 2 deletions
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
index 511c797..a3420da 100644
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
@@ -4772,7 +4772,12 @@ void QApplicationPrivate::emitLastWindowClosed()
If \a enable is true, Qt::Key_Up and Qt::Key_Down are used to change focus.
- This feature is available in Qt for Embedded Linux and Symbian only.
+ This feature is available in Qt for Embedded Linux, Symbian and Windows CE
+ only.
+
+ \note On Windows CE this feature is disabled by default for touch device
+ mkspecs. To enable keypad navigation, build Qt with
+ QT_KEYPAD_NAVIGATION defined.
\sa keypadNavigationEnabled()
*/
@@ -4785,7 +4790,12 @@ void QApplication::setKeypadNavigationEnabled(bool enable)
Returns true if Qt is set to use keypad navigation; otherwise returns
false. The default value is true on Symbian, but false on other platforms.
- This feature is available in Qt for Embedded Linux and Symbian only.
+ This feature is available in Qt for Embedded Linux, Symbian and Windows CE
+ only.
+
+ \note On Windows CE this feature is disabled by default for touch device
+ mkspecs. To enable keypad navigation, build Qt with
+ QT_KEYPAD_NAVIGATION defined.
\sa setKeypadNavigationEnabled()
*/