diff options
author | Martin Smith <msmith@trolltech.com> | 2010-01-27 08:53:40 (GMT) |
---|---|---|
committer | Martin Smith <msmith@trolltech.com> | 2010-01-27 08:53:40 (GMT) |
commit | fdd5a4f3c18b47826ebe63d8753cd27164ad8169 (patch) | |
tree | c78d347f4fe576288a95e8239bbca2da99f0626e /src/dbus/qdbusargument.cpp | |
parent | aebc34877fb17405e8e5915760012a82d0178b97 (diff) | |
parent | 35386ae28887d56cf6fd6f6cc7ceaf0506abe18a (diff) | |
download | Qt-fdd5a4f3c18b47826ebe63d8753cd27164ad8169.zip Qt-fdd5a4f3c18b47826ebe63d8753cd27164ad8169.tar.gz Qt-fdd5a4f3c18b47826ebe63d8753cd27164ad8169.tar.bz2 |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'src/dbus/qdbusargument.cpp')
-rw-r--r-- | src/dbus/qdbusargument.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/dbus/qdbusargument.cpp b/src/dbus/qdbusargument.cpp index 3466d90..7defc9a 100644 --- a/src/dbus/qdbusargument.cpp +++ b/src/dbus/qdbusargument.cpp @@ -535,7 +535,6 @@ QDBusArgument &QDBusArgument::operator<<(const QByteArray &arg) /*! \internal - Returns the type signature of the D-Bus type this QDBusArgument \since 4.5 Appends the variant \a v. |