From 0e46e8d319d054c7325d00b97ba4d7bd30f97e7c Mon Sep 17 00:00:00 2001 From: Luke Andrew Date: Tue, 4 Mar 2014 14:40:35 -0700 Subject: Fixed info update for FTDI devices on Android Added check for Q_OS_ANDROID. If connected to Android, look for a valid TTY_USB id. Task-number: QTBUG-36296 Change-Id: Ic99b0ddd7afc6621e795e2f6cf2952cae6634fb0 Reviewed-by: Luke Andrew Reviewed-by: Laszlo Papp --- src/serialport/qserialportinfo_unix.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/serialport/qserialportinfo_unix.cpp b/src/serialport/qserialportinfo_unix.cpp index 9ef113ba..5a77abcc 100644 --- a/src/serialport/qserialportinfo_unix.cpp +++ b/src/serialport/qserialportinfo_unix.cpp @@ -132,13 +132,15 @@ QList availablePortsBySysfs() continue; QSerialPortInfo serialPortInfo; - if (targetPath.contains(QStringLiteral("pnp"))) { // TODO: Obtain more information +#ifndef Q_OS_ANDROID } else if (targetPath.contains(QStringLiteral("platform"))) { +#else + } else if (targetPath.contains(QStringLiteral("platform")) && !targetPath.contains(QStringLiteral("ttyUSB")) ) { +#endif continue; } else if (targetPath.contains(QStringLiteral("usb"))) { - QDir targetDir(targetPath); targetDir.setFilter(QDir::Files | QDir::Readable); targetDir.setNameFilters(QStringList(QStringLiteral("uevent"))); -- cgit v1.2.3