diff options
author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-11-02 17:43:10 (GMT) |
---|---|---|
committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-11-02 17:43:10 (GMT) |
commit | 5fc1013753babd397efbe5b7bae0dac387fbc2fd (patch) | |
tree | 3a5ccd5b15397879ae4ec26a8708b5ee2d86dc15 /src/corelib/kernel | |
parent | 20cfe1e790295254370cf472df39813f864de7ea (diff) | |
parent | e4bec39a139363d1ee4cf3fb15a3fe4499215e77 (diff) | |
download | Qt-5fc1013753babd397efbe5b7bae0dac387fbc2fd.zip Qt-5fc1013753babd397efbe5b7bae0dac387fbc2fd.tar.gz Qt-5fc1013753babd397efbe5b7bae0dac387fbc2fd.tar.bz2 |
Merge commit 'e4bec39a139363d1ee4cf3fb15a3fe4499215e77' into 4.6
Diffstat (limited to 'src/corelib/kernel')
-rw-r--r-- | src/corelib/kernel/qmetaobject.cpp | 4 |
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; |