diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-25 16:35:57 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-25 16:35:57 (GMT) |
| commit | 50e915e4fe8b6bcd579f5fae31bfa9d736f9b6f5 (patch) | |
| tree | 7517568b333bcc5679e7a165c48aaa7bd06a66fb /src/dbus/qdbusargument.h | |
| parent | 61f013168e5ef5111948a1ae0a1464753986adb2 (diff) | |
| parent | ce40a078caa4a09793128ca730cc5ca268aeee87 (diff) | |
| download | Qt-50e915e4fe8b6bcd579f5fae31bfa9d736f9b6f5.zip Qt-50e915e4fe8b6bcd579f5fae31bfa9d736f9b6f5.tar.gz Qt-50e915e4fe8b6bcd579f5fae31bfa9d736f9b6f5.tar.bz2 | |
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'src/dbus/qdbusargument.h')
| -rw-r--r-- | src/dbus/qdbusargument.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dbus/qdbusargument.h b/src/dbus/qdbusargument.h index 30f2cda..84d0349 100644 --- a/src/dbus/qdbusargument.h +++ b/src/dbus/qdbusargument.h @@ -172,7 +172,7 @@ template<typename T> inline T qdbus_cast(const QVariant &v return qvariant_cast<T>(v); } -// specialise for QVariant, allowing it to be used in place of QDBusVariant +// specialize for QVariant, allowing it to be used in place of QDBusVariant template<> inline QVariant qdbus_cast<QVariant>(const QDBusArgument &arg, QVariant *) { QDBusVariant item; |