diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-20 11:50:04 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-20 22:08:29 +0100 |
| commit | dcb710dd87ab15c3af803133ff2449902dbec036 (patch) | |
| tree | 1f3ed87165f05e45260ff45fb15d5df96d684abb /src/dbus | |
| parent | 4606ea53958df33fffba680dd75c8b1733ca9f40 (diff) | |
| parent | e47c2744e6cefa42fc70320e07d534742934f737 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
mkspecs/features/unix/separate_debug_info.prf
src/gui/kernel/qwindow_p.h
src/plugins/platforms/cocoa/qcocoacursor.mm
tests/auto/tools/moc/tst_moc.cpp
Change-Id: Ieb57834c00f961a747ffe51e6eb9fc9612cebccf
Diffstat (limited to 'src/dbus')
| -rw-r--r-- | src/dbus/qdbusargument.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/dbus/qdbusargument.cpp b/src/dbus/qdbusargument.cpp index 191eb5eea6..dab2daf90f 100644 --- a/src/dbus/qdbusargument.cpp +++ b/src/dbus/qdbusargument.cpp @@ -212,7 +212,8 @@ bool QDBusArgumentPrivate::checkReadAndDetach(QDBusArgumentPrivate *&d) The following example illustrates this wrong usage in context of a class that may contain invalid data: - \badcode + \code + //bad code // Wrongly marshall the MyTime data into a D-Bus argument QDBusArgument &operator<<(QDBusArgument &argument, const MyTime &mytime) { |