summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Molkentin <daniel.molkentin@nokia.com>2010-07-22 17:04:06 (GMT)
committerDaniel Molkentin <daniel.molkentin@nokia.com>2010-07-22 17:04:06 (GMT)
commit0b68204919a81c2aeca7924711cd5e159dca7903 (patch)
tree07b41befd4230b25052edbd76df67f84118d3723
parent62b2022f1e3188b11cf16770a92824eeb2ad70a3 (diff)
downloadQt-0b68204919a81c2aeca7924711cd5e159dca7903.zip
Qt-0b68204919a81c2aeca7924711cd5e159dca7903.tar.gz
Qt-0b68204919a81c2aeca7924711cd5e159dca7903.tar.bz2
If the QEventDispatcherGlibc causes warnings, it should say so
Reviewed-By: dt
-rw-r--r--src/corelib/kernel/qeventdispatcher_glib.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/kernel/qeventdispatcher_glib.cpp b/src/corelib/kernel/qeventdispatcher_glib.cpp
index 9c1c827..8390275 100644
--- a/src/corelib/kernel/qeventdispatcher_glib.cpp
+++ b/src/corelib/kernel/qeventdispatcher_glib.cpp
@@ -504,7 +504,7 @@ void QEventDispatcherGlib::registerTimer(int timerId, int interval, QObject *obj
{
#ifndef QT_NO_DEBUG
if (timerId < 1 || interval < 0 || !object) {
- qWarning("QEventDispatcherUNIX::registerTimer: invalid arguments");
+ qWarning("QEventDispatcherGlib::registerTimer: invalid arguments");
return;
} else if (object->thread() != thread() || thread() != QThread::currentThread()) {
qWarning("QObject::startTimer: timers cannot be started from another thread");
@@ -520,7 +520,7 @@ bool QEventDispatcherGlib::unregisterTimer(int timerId)
{
#ifndef QT_NO_DEBUG
if (timerId < 1) {
- qWarning("QEventDispatcherUNIX::unregisterTimer: invalid argument");
+ qWarning("QEventDispatcherGlib::unregisterTimer: invalid argument");
return false;
} else if (thread() != QThread::currentThread()) {
qWarning("QObject::killTimer: timers cannot be stopped from another thread");
@@ -536,7 +536,7 @@ bool QEventDispatcherGlib::unregisterTimers(QObject *object)
{
#ifndef QT_NO_DEBUG
if (!object) {
- qWarning("QEventDispatcherUNIX::unregisterTimers: invalid argument");
+ qWarning("QEventDispatcherGlib::unregisterTimers: invalid argument");
return false;
} else if (object->thread() != thread() || thread() != QThread::currentThread()) {
qWarning("QObject::killTimers: timers cannot be stopped from another thread");