diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-06-26 17:27:19 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-06-26 17:27:19 +0200 |
| commit | dd142cccc7008c78ae74f3d02da402e2415becd2 (patch) | |
| tree | c8a8726084ef36e8d64726a54fe5fb345a833af8 | |
| parent | 1c39ee6399658e58f8a979e2fb2c1cb66520343c (diff) | |
| parent | 406d8d83cc11601d7121f1cb5de806a090080ddd (diff) | |
| download | qtserialport-dd142cccc7008c78ae74f3d02da402e2415becd2.tar.gz | |
Merge remote-tracking branch 'origin/5.3' into dev
Conflicts:
.qmake.conf
Change-Id: Ib1727ebdc69ab673d782c39ba9f1b5f51c192d4b
| -rw-r--r-- | src/serialport/qserialportinfo_unix.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/serialport/qserialportinfo_unix.cpp b/src/serialport/qserialportinfo_unix.cpp index b4caf88..ce5f3a9 100644 --- a/src/serialport/qserialportinfo_unix.cpp +++ b/src/serialport/qserialportinfo_unix.cpp @@ -338,8 +338,8 @@ QList<QSerialPortInfo> availablePortsByUdev() serialPortInfo.d_ptr->description = getUdevModelName(dev.data()); serialPortInfo.d_ptr->manufacturer = getUdevVendorName(dev.data()); serialPortInfo.d_ptr->serialNumber = getUdevSerialNumber(dev.data()); - serialPortInfo.d_ptr->vendorIdentifier = getUdevModelIdentifier(dev.data(), serialPortInfo.d_ptr->hasVendorIdentifier); - serialPortInfo.d_ptr->productIdentifier = getUdevVendorIdentifier(dev.data(), serialPortInfo.d_ptr->hasProductIdentifier); + serialPortInfo.d_ptr->vendorIdentifier = getUdevVendorIdentifier(dev.data(), serialPortInfo.d_ptr->hasVendorIdentifier); + serialPortInfo.d_ptr->productIdentifier = getUdevModelIdentifier(dev.data(), serialPortInfo.d_ptr->hasProductIdentifier); } else { if (serialPortInfo.d_ptr->portName.startsWith(rfcommDeviceName)) { bool ok; |