diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-12 13:09:58 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-12 13:09:58 +0200 |
| commit | c6027a9c0e6182bde7106bc97b927c544e76e155 (patch) | |
| tree | cb0ee001e8204df9643e04ed4b8961b8eb6c68f5 /examples/serialport/doc/terminal.qdoc | |
| parent | 789c0ebcd4ed976eb124e2da1958a48b478751c0 (diff) | |
| parent | 3c3b23b32c6d4a9067363f758aaf4ff9819b7fd8 (diff) | |
| download | qtserialport-c6027a9c0e6182bde7106bc97b927c544e76e155.tar.gz | |
Merge remote-tracking branch 'origin/5.3' into 5.4
Conflicts:
examples/serialport/examples.qdoc
Change-Id: If79f2f140e72f0a499f8e61e3897848f454a5042
Diffstat (limited to 'examples/serialport/doc/terminal.qdoc')
| -rw-r--r-- | examples/serialport/doc/terminal.qdoc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/examples/serialport/doc/terminal.qdoc b/examples/serialport/doc/terminal.qdoc index ed8fa02..423d610 100644 --- a/examples/serialport/doc/terminal.qdoc +++ b/examples/serialport/doc/terminal.qdoc @@ -1,6 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2011 - 2012 Denis Shienkov <denis.shienkov@gmail.com> +** 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. @@ -29,11 +30,12 @@ \example terminal \title Terminal Example \ingroup qtserialport-examples + \brief Shows how to use various features of QSerialPort. - The Terminal example shows how to create a terminal for a simple serial - interface by using Qt Serial Port. + \e Terminal shows how to create a terminal for a simple serial interface by + using \l{Qt Serial Port}. - \image terminal-example.png Screenshot of the Terminal example + \image terminal-example.png This example shows the main features of the QSerialPort class, like configuration, I/O implementation and so forth. Also, the class @@ -143,4 +145,6 @@ port. \sa {Blocking Slave Example} + + \include examples-run.qdocinc */ |