diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-18 00:48:47 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-18 00:48:47 (GMT) |
| commit | 7296a5419cf1e0d616aa193829196ec42db55db4 (patch) | |
| tree | 18d39e20ddec01ed1785b38267cdeceba0a627c0 | |
| parent | f612cb0f6bf4dd06fa344b1a5862985209fa5533 (diff) | |
| parent | d7212b3b8b804c3621b0c39e9f07afecc5b39a4d (diff) | |
| download | Qt-7296a5419cf1e0d616aa193829196ec42db55db4.zip Qt-7296a5419cf1e0d616aa193829196ec42db55db4.tar.gz Qt-7296a5419cf1e0d616aa193829196ec42db55db4.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Revert "Add a warning about trying to release a timer ID that isn't active"
| -rw-r--r-- | src/corelib/kernel/qeventdispatcher_unix.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/corelib/kernel/qeventdispatcher_unix.cpp b/src/corelib/kernel/qeventdispatcher_unix.cpp index 14e8991..050805f 100644 --- a/src/corelib/kernel/qeventdispatcher_unix.cpp +++ b/src/corelib/kernel/qeventdispatcher_unix.cpp @@ -501,7 +501,6 @@ bool QTimerInfoList::unregisterTimer(int timerId) } } // id not found - qWarning("Application asked to unregister timer 0x%x which is not registered in this thread. Fix application.", timerId); return false; } |