summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-05-11 03:01:56 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-05-11 03:01:56 +0200
commitbab8ca799f3a54c10f92958f2db1ce482adfc08c (patch)
treea76099169b452b912c2a450d83dc6e3eceaa79f5
parentc1766c64f9f76c075aa1f1723f193bcbfd5e79b2 (diff)
parent574098ec0d928d8eb02cf997318c0168952297e9 (diff)
downloadqtserialport-bab8ca799f3a54c10f92958f2db1ce482adfc08c.tar.gz
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I3d5718006e8fee8fa3c2f97aec03183a4db1aa7c
-rw-r--r--src/serialport/qserialportinfo_unix.cpp12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/serialport/qserialportinfo_unix.cpp b/src/serialport/qserialportinfo_unix.cpp
index 0f62a9d..105d10a 100644
--- a/src/serialport/qserialportinfo_unix.cpp
+++ b/src/serialport/qserialportinfo_unix.cpp
@@ -169,6 +169,12 @@ static bool isVirtualNullModemDevice(const QString &portName)
return portName.startsWith(QLatin1String("tnt"));
}
+// provided by the g_serial driver
+static bool isGadgetDevice(const QString &portName)
+{
+ return portName.startsWith(QLatin1String("ttyGS"));
+}
+
static QString ueventProperty(const QDir &targetDir, const QByteArray &pattern)
{
QFile f(QFileInfo(targetDir, QStringLiteral("uevent")).absoluteFilePath());
@@ -265,7 +271,8 @@ QList<QSerialPortInfo> availablePortsBySysfs(bool &ok)
const QString driverName = deviceDriver(targetDir);
if (driverName.isEmpty()) {
if (!isRfcommDevice(priv.portName)
- && !isVirtualNullModemDevice(priv.portName)) {
+ && !isVirtualNullModemDevice(priv.portName)
+ && !isGadgetDevice(priv.portName)) {
continue;
}
}
@@ -436,7 +443,8 @@ QList<QSerialPortInfo> availablePortsByUdev(bool &ok)
priv.productIdentifier = deviceProductIdentifier(dev.data(), priv.hasProductIdentifier);
} else {
if (!isRfcommDevice(priv.portName)
- && !isVirtualNullModemDevice(priv.portName)) {
+ && !isVirtualNullModemDevice(priv.portName)
+ && !isGadgetDevice(priv.portName)) {
continue;
}
}