diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2014-05-08 09:51:40 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@digia.com> | 2014-05-08 09:51:40 +0200 |
| commit | 94445dd4b9a6754a63736a05b9bccaaffc0a4038 (patch) | |
| tree | fedeb79f2a583da4935fcd8fc5f70298812c056d /examples/bluetooth/pingpong | |
| parent | 74449f1b0b2952dcbad9525c167b36fbf908696f (diff) | |
| parent | ef7de5da3d4d2346ec7110413c8fb12db8c94013 (diff) | |
Merge branch 'stable' into dev
Conflicts:
.qmake.conf
src/bluetooth/qbluetoothlocaldevice_bluez.cpp
src/bluetooth/qbluetoothserver_p.h
src/bluetooth/qbluetoothsocket_qnx.cpp
Change-Id: I08792f10155f9b4e6af30066b70e24b48985ddd6
Diffstat (limited to 'examples/bluetooth/pingpong')
| -rw-r--r-- | examples/bluetooth/pingpong/doc/src/pingpong.qdoc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/examples/bluetooth/pingpong/doc/src/pingpong.qdoc b/examples/bluetooth/pingpong/doc/src/pingpong.qdoc index df7fcc34..0e82a71a 100644 --- a/examples/bluetooth/pingpong/doc/src/pingpong.qdoc +++ b/examples/bluetooth/pingpong/doc/src/pingpong.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,6 +28,7 @@ /*! \example pingpong \title Bluetooth QML Ping Pong example + \brief A QML example showing Bluetooth communication. The Bluetooth QML Ping Pong example presents the socket communication between two Bluetooth devices. The basic concept is the ping pong game where two players @@ -35,6 +36,8 @@ \image intro.png + \include examples-run.qdocinc + At the beginning, the user selects the role. One device acts as a server and the second one as a client. After selecting the role, adjustments to the screen size are done (two devices might have different screen sizes). The server side starts a service named @@ -77,4 +80,3 @@ \image intro1.png */ - |