summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qwidget_s60.cpp
diff options
context:
space:
mode:
authorA-Team <ateam@pad.test.qt.nokia.com>2010-11-19 23:00:14 (GMT)
committerA-Team <ateam@pad.test.qt.nokia.com>2010-11-19 23:00:14 (GMT)
commit1d11e612c2970af69061806b40b0d632a87a8309 (patch)
treeae332b14b6ee1542519b728e2414b3a270525372 /src/gui/kernel/qwidget_s60.cpp
parentca1fcd8e9cbedab190efdb456f78e5f604293b3b (diff)
parent0cfa6daa4776cd78370e644fae3005ae432b83c7 (diff)
downloadQt-1d11e612c2970af69061806b40b0d632a87a8309.zip
Qt-1d11e612c2970af69061806b40b0d632a87a8309.tar.gz
Qt-1d11e612c2970af69061806b40b0d632a87a8309.tar.bz2
Merge branch '4.7-upstream' into 4.7-doc
Diffstat (limited to 'src/gui/kernel/qwidget_s60.cpp')
-rw-r--r--src/gui/kernel/qwidget_s60.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qwidget_s60.cpp b/src/gui/kernel/qwidget_s60.cpp
index cf4bdf1..97917ba 100644
--- a/src/gui/kernel/qwidget_s60.cpp
+++ b/src/gui/kernel/qwidget_s60.cpp
@@ -57,7 +57,7 @@
#include <eikbtgpc.h>
#endif
-// This is necessary in order to be able to perform delayed invokation on slots
+// This is necessary in order to be able to perform delayed invocation on slots
// which take arguments of type WId. One example is
// QWidgetPrivate::_q_delayedDestroy, which is used to delay destruction of
// CCoeControl objects until after the CONE event handler has finished running.