From d8d4cc39629fbd498981f5b78a8412f1cbba2372 Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Wed, 4 Jan 2012 12:22:33 +0100 Subject: Warn when using QBasicTimer::start() incorrectly 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 Reviewed-by: Robin Burchell --- src/corelib/kernel/qbasictimer.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/corelib/kernel/qbasictimer.cpp b/src/corelib/kernel/qbasictimer.cpp index 5890df392f..617e5e560f 100644 --- a/src/corelib/kernel/qbasictimer.cpp +++ b/src/corelib/kernel/qbasictimer.cpp @@ -116,8 +116,10 @@ QT_BEGIN_NAMESPACE void QBasicTimer::start(int msec, QObject *obj) { QAbstractEventDispatcher *eventDispatcher = QAbstractEventDispatcher::instance(); - if (!eventDispatcher) + if (!eventDispatcher) { + qWarning("QBasicTimer::start: QBasicTimer can only be used with threads started with QThread"); return; + } if (id) { eventDispatcher->unregisterTimer(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) { QAbstractEventDispatcher *eventDispatcher = QAbstractEventDispatcher::instance(); - if (!eventDispatcher) + if (!eventDispatcher) { + qWarning("QBasicTimer::start: QBasicTimer can only be used with threads started with QThread"); return; + } if (id) { eventDispatcher->unregisterTimer(id); QAbstractEventDispatcherPrivate::releaseTimerId(id); -- cgit v1.2.3