diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-25 14:00:05 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-25 14:00:05 (GMT) |
commit | ce40a078caa4a09793128ca730cc5ca268aeee87 (patch) | |
tree | e29aa8e561552721ad3f7ed42cdae99b23ec0960 /src/dbus/qdbusintegrator.cpp | |
parent | 022884db790a7592fa017add4ea9669d8b5598ca (diff) | |
parent | 0ade09152067324f74678f2de4d447b6e0280600 (diff) | |
download | Qt-ce40a078caa4a09793128ca730cc5ca268aeee87.zip Qt-ce40a078caa4a09793128ca730cc5ca268aeee87.tar.gz Qt-ce40a078caa4a09793128ca730cc5ca268aeee87.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fixed many spelling errors.
Diffstat (limited to 'src/dbus/qdbusintegrator.cpp')
-rw-r--r-- | src/dbus/qdbusintegrator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp index 31588e7..a5d8ada 100644 --- a/src/dbus/qdbusintegrator.cpp +++ b/src/dbus/qdbusintegrator.cpp @@ -801,7 +801,7 @@ bool QDBusConnectionPrivate::activateCall(QObject* object, int flags, const QDBu ++cacheIt; if (cacheIt == slotCache.hash.constEnd() || cacheIt.key() != cacheKey) { - // not cached, analyse the meta object + // not cached, analyze the meta object const QMetaObject *mo = object->metaObject(); QByteArray memberName = msg.member().toUtf8(); |