diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-16 03:06:48 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-16 03:06:48 +0100 |
| commit | 5694c022c1682998f7ff00570fad7809dd0b6543 (patch) | |
| tree | 8ee0b580e017d7410d758f2368729c2a2e420b79 | |
| parent | 2da598e1a27c829c98759ab7068c9e657e85432c (diff) | |
| parent | d4dc8988c5cfc6e0080e9ef17f8393a6a06cbb98 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I17856982d1a7ecad1adea7e49311fea558a34ef4
| -rw-r--r-- | examples/serialport/doc/terminal.qdoc | 2 | ||||
| -rw-r--r-- | src/serialport/qwinoverlappedionotifier.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/examples/serialport/doc/terminal.qdoc b/examples/serialport/doc/terminal.qdoc index 65cabb92..02156775 100644 --- a/examples/serialport/doc/terminal.qdoc +++ b/examples/serialport/doc/terminal.qdoc @@ -122,7 +122,7 @@ \snippet terminal/mainwindow.cpp 6 This slot sends the characters typed in the given - \l{terminal/console.cpp}{Console} widget to the serial port. + Console widget to the serial port - see \c terminal/console.cpp. When the serial port receives new data, the signal \l{QIODevice::}{readyRead()} is emitted, and that signal is diff --git a/src/serialport/qwinoverlappedionotifier.cpp b/src/serialport/qwinoverlappedionotifier.cpp index 615dacc9..f29bae0a 100644 --- a/src/serialport/qwinoverlappedionotifier.cpp +++ b/src/serialport/qwinoverlappedionotifier.cpp @@ -350,6 +350,7 @@ private: }; /*! + * \internal * Wait synchronously for any notified signal. * * The function returns a pointer to the OVERLAPPED object corresponding to the completed I/O @@ -365,6 +366,7 @@ OVERLAPPED *QWinOverlappedIoNotifier::waitForAnyNotified(QDeadlineTimer deadline } /*! + * \internal * Wait synchronously for the notified signal. * * The function returns true if the notified signal was emitted for |