Integrate merge-request #573 into branch 'master'

jieshuzheng (1):
      Remove the redundant timer kill and start when the two

Request-url: http://qt.gitorious.org/qt/qt/merge_requests/573
Reviewed-by: Eskil Abrahamsen Blomfeldt <eblomfel@trolltech.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/src/corelib/kernel/qtimer.cpp b/src/corelib/kernel/qtimer.cpp
index 08821d4..8ca53b9 100644
--- a/src/corelib/kernel/qtimer.cpp
+++ b/src/corelib/kernel/qtimer.cpp
@@ -211,7 +211,7 @@ void QTimer::start()
 */
 void QTimer::start(int msec)
 {
-    setInterval(msec);
+    inter = msec;
     start();
 }