diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-20 15:55:55 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-25 10:22:53 +0100 |
| commit | a325de1910e6627e4d042114d22303cc68fae7a9 (patch) | |
| tree | cabf88f9e4e42579e6695ecff5e6ab787f3922ab /examples/serialport/doc | |
| parent | d42d5838b9a4c3cbd6b0e67dabce658ba737eba8 (diff) | |
| parent | b84fe7eb3d6d977a347bfbb82da724409b2eda69 (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
.qmake.conf
src/serialport/qserialport_unix.cpp
src/serialport/qserialport_unix_p.h
src/serialport/qserialport_win.cpp
src/serialport/qserialport_win_p.h
src/serialport/qserialport_wince.cpp
src/serialport/qserialport_wince_p.h
Change-Id: Ibb917652b132e66fbb90f437bf762c1094911dc0
Diffstat (limited to 'examples/serialport/doc')
| -rw-r--r-- | examples/serialport/doc/cenumerator.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/serialport/doc/cenumerator.qdoc b/examples/serialport/doc/cenumerator.qdoc index 26d6a4ec..67057ac8 100644 --- a/examples/serialport/doc/cenumerator.qdoc +++ b/examples/serialport/doc/cenumerator.qdoc @@ -29,7 +29,7 @@ /*! \example cenumerator \title Command Line Enumerator Example - \ingroup qtserialport-example + \ingroup qtserialport-examples \brief Shows how to get information about serial devices in a system. \e{Command Line Enumerator} shows how to use the class QSerialPortInfo for |