AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Warn when using QBasicTimer::start() incorrectly

Browse Source 
Previously, QObject::startTimer() would warn when called from
QBasicTimer::start() if there was no event dispatcher for the object's
thread. QBasicTimer::start() should output a similar warning when there
is no event dispatcher for the current thread.

Change-Id: I1152f73216c3551c252a7a6995defebc9e1506c8
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
This commit is contained in:
Bradley T. Hughes 2012-01-04 12:22:33 +01:00 committed by Qt by Nokia
parent 1fdfc2abfe
commit d8d4cc3962
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/corelib/kernel/qbasictimer.cpp
View File

@ -116,8 +116,10 @@ QT_BEGIN_NAMESPACE
void QBasicTimer::start(int msec, QObject *obj) void QBasicTimer::start(int msec, QObject *obj)
{ {
QAbstractEventDispatcher *eventDispatcher = QAbstractEventDispatcher::instance(); QAbstractEventDispatcher *eventDispatcher = QAbstractEventDispatcher::instance();
if (!eventDispatcher) if (!eventDispatcher) {
qWarning("QBasicTimer::start: QBasicTimer can only be used with threads started with QThread");
return; return;
}
if (id) { if (id) {
eventDispatcher->unregisterTimer(id); eventDispatcher->unregisterTimer(id);
QAbstractEventDispatcherPrivate::releaseTimerId(id); QAbstractEventDispatcherPrivate::releaseTimerId(id);
@ -141,8 +143,10 @@ void QBasicTimer::start(int msec, QObject *obj)
void QBasicTimer::start(int msec, Qt::TimerType timerType, QObject *obj) void QBasicTimer::start(int msec, Qt::TimerType timerType, QObject *obj)
{ {
QAbstractEventDispatcher *eventDispatcher = QAbstractEventDispatcher::instance(); QAbstractEventDispatcher *eventDispatcher = QAbstractEventDispatcher::instance();
if (!eventDispatcher) if (!eventDispatcher) {
qWarning("QBasicTimer::start: QBasicTimer can only be used with threads started with QThread");
return; return;
}
if (id) { if (id) {
eventDispatcher->unregisterTimer(id); eventDispatcher->unregisterTimer(id);
QAbstractEventDispatcherPrivate::releaseTimerId(id); QAbstractEventDispatcherPrivate::releaseTimerId(id);