diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-25 10:26:13 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-25 10:26:13 +0100 |
| commit | 4458f9376aa88b556e38d81180c5966889009bfb (patch) | |
| tree | 44b5b9921eb4f9cf5030317685544c4d20820935 /src/serialport/qserialportinfo.cpp | |
| parent | 23902340662f1ef6f5dafe68a34b593aed6ea497 (diff) | |
| parent | f640521532087dc76d36b25a6c49b2f64afcd4de (diff) | |
| download | qtserialport-4458f9376aa88b556e38d81180c5966889009bfb.tar.gz | |
Merge remote-tracking branch 'origin/5.8' into devv5.9.0-alpha1
Conflicts:
.qmake.conf
Change-Id: Ie713faf0d6395f11477fceb35c93388756e33fae
Diffstat (limited to 'src/serialport/qserialportinfo.cpp')
| -rw-r--r-- | src/serialport/qserialportinfo.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/serialport/qserialportinfo.cpp b/src/serialport/qserialportinfo.cpp index d978665..2547e01 100644 --- a/src/serialport/qserialportinfo.cpp +++ b/src/serialport/qserialportinfo.cpp @@ -228,8 +228,8 @@ quint16 QSerialPortInfo::productIdentifier() const } /*! - Returns true if there is a valid 16-bit vendor number present; otherwise - returns false. + Returns \c true if there is a valid \c 16-bit vendor number present; otherwise + returns \c false. \sa vendorIdentifier(), productIdentifier(), hasProductIdentifier() */ @@ -240,8 +240,8 @@ bool QSerialPortInfo::hasVendorIdentifier() const } /*! - Returns true if there is a valid 16-bit product number present; otherwise - returns false. + Returns \c true if there is a valid \c 16-bit product number present; otherwise + returns \c false. \sa productIdentifier(), vendorIdentifier(), hasVendorIdentifier() */ @@ -264,8 +264,8 @@ bool QSerialPortInfo::hasProductIdentifier() const /*! \fn bool QSerialPortInfo::isBusy() const - Returns true if serial port is busy; - otherwise returns false. + Returns \c true if serial port is busy; + otherwise returns \c false. \sa isNull() */ @@ -276,8 +276,8 @@ bool QSerialPortInfo::hasProductIdentifier() const \fn bool QSerialPortInfo::isValid() const \obsolete - Returns true if serial port is present on system; - otherwise returns false. + Returns \c true if serial port is present on system; + otherwise returns \c false. \sa isNull(), isBusy() */ |