summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel/qmetaobject.cpp
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-10-29 09:28:28 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2009-10-29 09:29:50 (GMT)
commit8307d3511b35adbb945948eda2cf54bbd3c0a20e (patch)
tree88fe79140725dfb5f0778b96135db4bd74ec0ced /src/corelib/kernel/qmetaobject.cpp
parentd5a228fbd44f7dd92a10981a5c835db66e3ea6f8 (diff)
downloadQt-8307d3511b35adbb945948eda2cf54bbd3c0a20e.zip
Qt-8307d3511b35adbb945948eda2cf54bbd3c0a20e.tar.gz
Qt-8307d3511b35adbb945948eda2cf54bbd3c0a20e.tar.bz2
Update confusing qWarning message.
Reviewed-by: Olivier Goffart
Diffstat (limited to 'src/corelib/kernel/qmetaobject.cpp')
-rw-r--r--src/corelib/kernel/qmetaobject.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp
index f98c449..71afc5b 100644
--- a/src/corelib/kernel/qmetaobject.cpp
+++ b/src/corelib/kernel/qmetaobject.cpp
@@ -574,8 +574,8 @@ int QMetaObjectPrivate::indexOfSignalRelative(const QMetaObject **baseObject, co
if (i >= 0 && m && m->d.superdata) {
int conflict = m->d.superdata->indexOfMethod(signal);
if (conflict >= 0)
- qWarning("QMetaObject::indexOfSignal:%s: Conflict with %s::%s",
- m->d.stringdata, m->d.superdata->d.stringdata, signal);
+ qWarning("QMetaObject::indexOfSignal: signal %s from %s redefined in %s",
+ signal, m->d.superdata->d.stringdata, m->d.stringdata);
}
#endif
return i;