summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorA-Team <ateam@pad.test.qt.nokia.com>2010-12-16 23:00:15 (GMT)
committerA-Team <ateam@pad.test.qt.nokia.com>2010-12-16 23:00:15 (GMT)
commitf021555182edb4163d1bca29ed16da6748029771 (patch)
tree4e08270009ae458e698f52b4de2172e5f97b511e /src/corelib
parentda1b6e7199dfd63cce79af0bd875df78b4d199db (diff)
parent640aad736476f7f8a4ec92fedecae234fb2e2d2e (diff)
downloadQt-f021555182edb4163d1bca29ed16da6748029771.zip
Qt-f021555182edb4163d1bca29ed16da6748029771.tar.gz
Qt-f021555182edb4163d1bca29ed16da6748029771.tar.bz2
Merge branch '4.7-upstream' into 4.7-doc
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/kernel/qeventdispatcher_unix.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/kernel/qeventdispatcher_unix.cpp b/src/corelib/kernel/qeventdispatcher_unix.cpp
index f50994c..b2ccc68 100644
--- a/src/corelib/kernel/qeventdispatcher_unix.cpp
+++ b/src/corelib/kernel/qeventdispatcher_unix.cpp
@@ -501,6 +501,7 @@ 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;
}