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/qdbusmarshaller.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/qdbusmarshaller.cpp')
| -rw-r--r-- | src/dbus/qdbusmarshaller.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dbus/qdbusmarshaller.cpp b/src/dbus/qdbusmarshaller.cpp index 8b174a1..e620152 100644 --- a/src/dbus/qdbusmarshaller.cpp +++ b/src/dbus/qdbusmarshaller.cpp @@ -507,7 +507,7 @@ bool QDBusMarshaller::appendCrossMarshalling(QDBusDemarshaller *demarshaller) if (code == DBUS_TYPE_ARRAY) { int element = q_dbus_message_iter_get_element_type(&demarshaller->iterator); if (q_dbus_type_is_fixed(element)) { - // another optimisation: fixed size arrays + // another optimization: fixed size arrays // code is exactly like QDBusDemarshaller::toByteArray DBusMessageIter sub; q_dbus_message_iter_recurse(&demarshaller->iterator, &sub); |