diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-30 11:23:57 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-30 11:23:57 (GMT) |
| commit | 2fb0d29126a4d0583dcbeb03c6205bd7b7aa794f (patch) | |
| tree | edadf070c25c41854d679835878159caa4de2fbd /src | |
| parent | 096474565f9683515dddb7175bb64a77d9f805f2 (diff) | |
| parent | ce3d9fb3b3ec1f23d76b04a8593680d7eeee689d (diff) | |
| download | Qt-2fb0d29126a4d0583dcbeb03c6205bd7b7aa794f.zip Qt-2fb0d29126a4d0583dcbeb03c6205bd7b7aa794f.tar.gz Qt-2fb0d29126a4d0583dcbeb03c6205bd7b7aa794f.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix crash in QDBusInterface when invoking a method in a derived class.
tst_selftest: Fix off-by-one error in cleaning up line numbers and filenames
Diffstat (limited to 'src')
| -rw-r--r-- | src/dbus/qdbusinterface.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dbus/qdbusinterface.cpp b/src/dbus/qdbusinterface.cpp index 300f425..56d5231 100644 --- a/src/dbus/qdbusinterface.cpp +++ b/src/dbus/qdbusinterface.cpp @@ -258,7 +258,7 @@ void *QDBusInterface::qt_metacast(const char *_clname) int QDBusInterface::qt_metacall(QMetaObject::Call _c, int _id, void **_a) { _id = QDBusAbstractInterface::qt_metacall(_c, _id, _a); - if (_id < 0 || !d_func()->isValid) + if (_id < 0 || !d_func()->isValid || !d_func()->metaObject) return _id; return d_func()->metacall(_c, _id, _a); } |