Merge remote-tracking branch 'origin/5.4' into dev

Conflicts:
	src/serialport/qserialport.cpp
	src/serialport/qserialport.h
	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_p.h
	src/serialport/qt4support/include/private/qcore_unix_p.h

Change-Id: Ifaa5ce8c1c0eb1c70246c54782719b91f3c95771

1 files changed, 28 insertions, 15 deletions

diff --git a/src/serialport/qserialportinfo_win.cpp b/src/serialport/qserialportinfo_win.cpp
index 4b30a09..a94a5ff 100644
--- a/src/serialport/qserialportinfo_win.cpp
+++ b/src/serialport/qserialportinfo_win.cpp
@@ -312,23 +312,23 @@ QList<QSerialPortInfo> QSerialPortInfo::availablePorts()
                 continue;
             }
 
-            QSerialPortInfo serialPortInfo;
+            QSerialPortInfoPrivate priv;
 
-            serialPortInfo.d_ptr->portName = portName;
-            serialPortInfo.d_ptr->device = QSerialPortPrivate::portNameToSystemLocation(portName);
-            serialPortInfo.d_ptr->description = deviceDescription(deviceInfoSet, &deviceInfoData);
-            serialPortInfo.d_ptr->manufacturer = deviceManufacturer(deviceInfoSet, &deviceInfoData);
+            priv.portName = portName;
+            priv.device = QSerialPortInfoPrivate::portNameToSystemLocation(portName);
+            priv.description = deviceDescription(deviceInfoSet, &deviceInfoData);
+            priv.manufacturer = deviceManufacturer(deviceInfoSet, &deviceInfoData);
 
             const QString instanceIdentifier = deviceInstanceIdentifier(deviceInfoData.DevInst);
 
-            serialPortInfo.d_ptr->serialNumber =
+            priv.serialNumber =
                     deviceSerialNumber(instanceIdentifier, deviceInfoData.DevInst);
-            serialPortInfo.d_ptr->vendorIdentifier =
-                    deviceVendorIdentifier(instanceIdentifier, serialPortInfo.d_ptr->hasVendorIdentifier);
-            serialPortInfo.d_ptr->productIdentifier =
-                    deviceProductIdentifier(instanceIdentifier, serialPortInfo.d_ptr->hasProductIdentifier);
+            priv.vendorIdentifier =
+                    deviceVendorIdentifier(instanceIdentifier, priv.hasVendorIdentifier);
+            priv.productIdentifier =
+                    deviceProductIdentifier(instanceIdentifier, priv.hasProductIdentifier);
 
-            serialPortInfoList.append(serialPortInfo);
+            serialPortInfoList.append(priv);
         }
         ::SetupDiDestroyDeviceInfoList(deviceInfoSet);
     }
@@ -336,10 +336,10 @@ QList<QSerialPortInfo> QSerialPortInfo::availablePorts()
     foreach (const QString &portName, portNamesFromHardwareDeviceMap()) {
         if (std::find_if(serialPortInfoList.begin(), serialPortInfoList.end(),
                          SerialPortNameEqualFunctor(portName)) == serialPortInfoList.end()) {
-            QSerialPortInfo serialPortInfo;
-            serialPortInfo.d_ptr->portName = portName;
-            serialPortInfo.d_ptr->device = QSerialPortPrivate::portNameToSystemLocation(portName);
-            serialPortInfoList.append(serialPortInfo);
+            QSerialPortInfoPrivate priv;
+            priv.portName = portName;
+            priv.device =  QSerialPortInfoPrivate::portNameToSystemLocation(portName);
+            serialPortInfoList.append(priv);
         }
     }
 
@@ -379,4 +379,17 @@ bool QSerialPortInfo::isValid() const
     return true;
 }
 
+QString QSerialPortInfoPrivate::portNameToSystemLocation(const QString &source)
+{
+    return source.startsWith(QStringLiteral("COM"))
+            ? (QStringLiteral("\\\\.\\") + source) : source;
+}
+
+QString QSerialPortInfoPrivate::portNameFromSystemLocation(const QString &source)
+{
+    return (source.startsWith(QStringLiteral("\\\\.\\"))
+            || source.startsWith(QStringLiteral("//./")))
+            ? source.mid(4) : source;
+}
+
 QT_END_NAMESPACE