summaryrefslogtreecommitdiffstats
path: root/src/corelib/global
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2009-11-17 14:27:48 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2009-11-17 14:27:48 (GMT)
commit62e641691b9a3eadc8b9fb2e31150cdf5b66115d (patch)
tree9033ae42f5b599e564421db69737ca0c70a85f53 /src/corelib/global
parente76c4c03c98091ee3e509a0f9b64daba472567ff (diff)
parente02859c3c7910ab3de0ec594fd493df946a5102d (diff)
downloadQt-62e641691b9a3eadc8b9fb2e31150cdf5b66115d.zip
Qt-62e641691b9a3eadc8b9fb2e31150cdf5b66115d.tar.gz
Qt-62e641691b9a3eadc8b9fb2e31150cdf5b66115d.tar.bz2
Merge remote branch 'mainline/4.6' into 4.6
Diffstat (limited to 'src/corelib/global')
-rw-r--r--src/corelib/global/qnamespace.qdoc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc
index ae47f13..7ee7a76 100644
--- a/src/corelib/global/qnamespace.qdoc
+++ b/src/corelib/global/qnamespace.qdoc
@@ -884,7 +884,7 @@
\value WA_InputMethodEnabled Enables input methods for Asian languages.
Must be set when creating custom text editing widgets.
- On Windows CE this flag can be used in addition to
+ On Windows CE and Symbian this flag can be used in addition to
QApplication::autoSipEnabled to automatically display the SIP when
entering a widget.