summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-03-01 17:15:00 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-03-01 17:15:00 (GMT)
commit936c0246881b9a2add2fd4bcc07735d5b93f490e (patch)
tree117366acf5566bbc4cb49aee61e3dea0d79df11c /src/corelib
parent2d719ce634efa5e0abfb5d76eb516133753b5a62 (diff)
parent83c37c2cdf7adf2604e1e6012a9e0e6e67d97d6b (diff)
downloadQt-936c0246881b9a2add2fd4bcc07735d5b93f490e.zip
Qt-936c0246881b9a2add2fd4bcc07735d5b93f490e.tar.gz
Qt-936c0246881b9a2add2fd4bcc07735d5b93f490e.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: removed dead code QMetaObject::invokeMethod: print a warning if the method is not found. Fixed qDrawPixmaps() to draw on integer coordinates on Mac OS X.
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/kernel/qmetaobject.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp
index be1b2ae..ecffe99 100644
--- a/src/corelib/kernel/qmetaobject.cpp
+++ b/src/corelib/kernel/qmetaobject.cpp
@@ -1137,8 +1137,11 @@ bool QMetaObject::invokeMethod(QObject *obj,
idx = obj->metaObject()->indexOfMethod(norm.constData());
}
- if (idx < 0 || idx >= obj->metaObject()->methodCount())
+ if (idx < 0 || idx >= obj->metaObject()->methodCount()) {
+ qWarning("QMetaObject::invokeMethod: No such method %s::%s",
+ obj->metaObject()->className(), sig.constData());
return false;
+ }
QMetaMethod method = obj->metaObject()->method(idx);
return method.invoke(obj, type, ret,
val0, val1, val2, val3, val4, val5, val6, val7, val8, val9);