summaryrefslogtreecommitdiffstats
path: root/src/dbus
diff options
context:
space:
mode:
authorThomas Zander <t.zander@nokia.com>2010-08-11 08:07:59 (GMT)
committerThomas Zander <t.zander@nokia.com>2010-08-11 08:07:59 (GMT)
commit02e0523fe2b1dfd08eadaf127023306f6aa64c6f (patch)
tree26f374407ac0976e69f092517d69e1c93332492c /src/dbus
parentd501b04974df3615ac12fa93e11e893a44fbe715 (diff)
parentc7a18308a2725e4d1763777cb549f1ae74848005 (diff)
downloadQt-02e0523fe2b1dfd08eadaf127023306f6aa64c6f.zip
Qt-02e0523fe2b1dfd08eadaf127023306f6aa64c6f.tar.gz
Qt-02e0523fe2b1dfd08eadaf127023306f6aa64c6f.tar.bz2
Merge commit 'remotes/origin/4.7' into qt47s2
Conflicts: doc/src/examples/simpletreemodel.qdoc doc/src/examples/spinboxdelegate.qdoc doc/src/index.qdoc src/declarative/qml/qdeclarativeimageprovider.cpp
Diffstat (limited to 'src/dbus')
-rw-r--r--src/dbus/qdbusargument.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dbus/qdbusargument.cpp b/src/dbus/qdbusargument.cpp
index fbbc6a2..0bde085 100644
--- a/src/dbus/qdbusargument.cpp
+++ b/src/dbus/qdbusargument.cpp
@@ -825,7 +825,7 @@ void QDBusArgument::endStructure()
\snippet doc/src/snippets/code/src_qdbus_qdbusargument.cpp 6
If the type you want to marshall is a QList, QVector or any of the
- Qt's \l {Generic Containers} that take one template parameter,
+ Qt's \l {Container Classes} that take one template parameter,
you need not declare an \c{operator<<} function for it, since
QtDBus provides generic templates to do the job of marshalling
the data. The same applies for STL's sequence containers, such
@@ -952,7 +952,7 @@ void QDBusArgument::endStructure() const
\snippet doc/src/snippets/code/src_qdbus_qdbusargument.cpp 9
If the type you want to demarshall is a QList, QVector or any of the
- Qt's \l {Generic Containers} that take one template parameter, you
+ Qt's \l {Container Classes} that take one template parameter, you
need not declare an \c{operator>>} function for it, since QtDBus
provides generic templates to do the job of demarshalling the data.
The same applies for STL's sequence containers, such as \c {std::list},