diff options
author | J-P Nurmi <jpnurmi@digia.com> | 2014-06-05 22:26:44 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@digia.com> | 2014-06-05 22:26:44 +0200 |
commit | 0fcce50af009f97efa2a5c5f2c74415c92830962 (patch) | |
tree | f8abf0e4f445fed9480b426b2f856b50911f1210 /examples/dbus/remotecontrolledcar/doc/src/dbus-remotecontrolledcar.qdoc | |
parent | 74d46a669badc5bf32187686102ca4e644a3c0af (diff) | |
parent | c54f7720d09e7d00f3309736bbeaaa6a81967ec1 (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
mkspecs/features/qt.prf
src/plugins/platforms/xcb/qxcbwindow.h
src/tools/qdoc/qdocindexfiles.cpp
src/widgets/kernel/qwidget_qpa.cpp
Change-Id: I214f57b03bc2ff86cf3b7dfe2966168af93a5a67
Diffstat (limited to 'examples/dbus/remotecontrolledcar/doc/src/dbus-remotecontrolledcar.qdoc')
-rw-r--r-- | examples/dbus/remotecontrolledcar/doc/src/dbus-remotecontrolledcar.qdoc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/examples/dbus/remotecontrolledcar/doc/src/dbus-remotecontrolledcar.qdoc b/examples/dbus/remotecontrolledcar/doc/src/dbus-remotecontrolledcar.qdoc index 522b0bacc7..a485a99299 100644 --- a/examples/dbus/remotecontrolledcar/doc/src/dbus-remotecontrolledcar.qdoc +++ b/examples/dbus/remotecontrolledcar/doc/src/dbus-remotecontrolledcar.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the documentation of the Qt Toolkit. @@ -28,9 +28,13 @@ /*! \example remotecontrolledcar \title D-Bus Remote Controlled Car Example + \ingroup examples-dbus + \brief Shows how to use Qt D-Bus to control a car from another application. - The Remote Controlled Car example shows how to use D-Bus to control one - application using another. + The Remote Controlled Car example shows how to use \l{Qt D-Bus} to control + one application from another. \image remotecontrolledcar-car-example.png + + \include examples-run.qdocinc */ |