summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel/qtimer.cpp
diff options
context:
space:
mode:
authorJanne Anttila <janne.anttila@digia.com>2009-05-22 07:11:44 (GMT)
committerJanne Anttila <janne.anttila@digia.com>2009-05-22 07:11:44 (GMT)
commitfb8e52465c3f6f9ce4535dfaaffe5c5237b8d88a (patch)
tree80f1f44df2da5dcf805752dd984bfe40a2e4a5a5 /src/corelib/kernel/qtimer.cpp
parentd98d592503ea4da14b99eca54ef0c62c62bc3172 (diff)
parent728c09141fa578a754e4bf9b6859f242ff519433 (diff)
downloadQt-fb8e52465c3f6f9ce4535dfaaffe5c5237b8d88a.zip
Qt-fb8e52465c3f6f9ce4535dfaaffe5c5237b8d88a.tar.gz
Qt-fb8e52465c3f6f9ce4535dfaaffe5c5237b8d88a.tar.bz2
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/corelib/kernel/qtimer.cpp')
-rw-r--r--src/corelib/kernel/qtimer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qtimer.cpp b/src/corelib/kernel/qtimer.cpp
index 01e81ab..4b3feb0 100644
--- a/src/corelib/kernel/qtimer.cpp
+++ b/src/corelib/kernel/qtimer.cpp
@@ -77,7 +77,7 @@ QT_BEGIN_NAMESPACE
In multithreaded applications, you can use QTimer in any thread
that has an event loop. To start an event loop from a non-GUI
- thread, use QThread::exec(). Qt uses the the timer's
+ thread, use QThread::exec(). Qt uses the timer's
\l{QObject::thread()}{thread affinity} to determine which thread
will emit the \l{QTimer::}{timeout()} signal. Because of this, you
must start and stop the timer in its thread; it is not possible to