1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Also print the class name in the QObject::killTimer error msg.

Browse Source 
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>
This commit is contained in:
Erik Verbruggen 2014-08-27 12:12:50 +02:00
parent e94642a9b0
commit f2e4ff4fd4
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/corelib/kernel/qobject.cpp
View File

@ -1636,9 +1636,10 @@ void QObject::killTimer(int id)
int at = d->extraData ? d->extraData->runningTimers.indexOf(id) : -1; int at = d->extraData ? d->extraData->runningTimers.indexOf(id) : -1;
if (at == -1) { if (at == -1) {
// timer isn't owned by this object // 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, id,
this, this,
metaObject()->className(),
qPrintable(objectName())); qPrintable(objectName()));
return; return;
} }