summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorErik Verbruggen <erik.verbruggen@digia.com>2014-08-27 12:12:50 +0200
committerErik Verbruggen <erik.verbruggen@digia.com>2014-08-27 12:18:13 +0200
commitf2e4ff4fd484d49e7338c9a2c5882782fe8f081b (patch)
tree933c72d2a959dd28189a2737bf09ae410c0efa1e /src
parente94642a9b0806f2e5dfd9a2f8c76ce5b420c3424 (diff)
Also print the class name in the QObject::killTimer error msg.
When no objectName is set, this will give at least some information, other than the memory address of the current instance. Change-Id: Iae452c0e9fe38f0aab35094ddf0edc0fd6b28c20 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src')
-rw-r--r--src/corelib/kernel/qobject.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index e714168e16..e588808ee8 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -1636,9 +1636,10 @@ void QObject::killTimer(int id)
int at = d->extraData ? d->extraData->runningTimers.indexOf(id) : -1;
if (at == -1) {
// timer isn't owned by this object
- qWarning("QObject::killTimer(): Error: timer id %d is not valid for object %p (%s), timer has not been killed",
+ qWarning("QObject::killTimer(): Error: timer id %d is not valid for object %p (%s, %s), timer has not been killed",
id,
this,
+ metaObject()->className(),
qPrintable(objectName()));
return;
}