diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-07 19:32:54 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-07 19:32:54 +0100 |
| commit | f8449352c9af0ee8055c6a85981e092e9d109b9d (patch) | |
| tree | 458d4f44ce94b764b773cacfc200329c0cb988d5 /src/serialport/qserialportinfo.cpp | |
| parent | 5bee9d9f0f8cf5415ad9337aed88bccac3c15ce1 (diff) | |
| parent | a2467f9ec2d09d6d665d169e0fb450169f921b12 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I35f19a7d266f90e957bfe01534a40c4d98b40b34
Diffstat (limited to 'src/serialport/qserialportinfo.cpp')
| -rw-r--r-- | src/serialport/qserialportinfo.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/serialport/qserialportinfo.cpp b/src/serialport/qserialportinfo.cpp index 84d9f06b..21dedb63 100644 --- a/src/serialport/qserialportinfo.cpp +++ b/src/serialport/qserialportinfo.cpp @@ -42,6 +42,7 @@ #include "qserialportinfo.h" #include "qserialportinfo_p.h" #include "qserialport.h" +#include "qserialport_p.h" QT_BEGIN_NAMESPACE @@ -287,9 +288,13 @@ bool QSerialPortInfo::hasProductIdentifier() const /*! \fn QList<qint32> QSerialPortInfo::standardBaudRates() - Returns a list of available standard baud rates supported by - the current serial port. + Returns a list of available standard baud rates supported + by the target platform. */ +QList<qint32> QSerialPortInfo::standardBaudRates() +{ + return QSerialPortPrivate::standardBaudRates(); +} /*! \fn QList<QSerialPortInfo> QSerialPortInfo::availablePorts() |