Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
  runonphone: Include USB serial ports on OS X for CODA, too

1 files changed, 15 insertions, 0 deletions

diff --git a/tools/runonphone/symbianutils/symbiandevicemanager.cpp b/tools/runonphone/symbianutils/symbiandevicemanager.cpp
index 23f5348..e8d0b5e 100644
--- a/tools/runonphone/symbianutils/symbiandevicemanager.cpp
+++ b/tools/runonphone/symbianutils/symbiandevicemanager.cpp
@@ -57,6 +57,7 @@
 #include <QtCore/QThread>
 #include <QtCore/QWaitCondition>
 #include <QtCore/QTimer>
+#include <QtCore/QDir>
 
 namespace SymbianUtils {
 
@@ -622,6 +623,20 @@ SymbianDeviceManager::SymbianDeviceList SymbianDeviceManager::blueToothDevices()
         }
     }
 #endif
+#if defined(Q_OS_MAC)
+    QDir dir("/dev");
+    QStringList filters;
+    filters << "cu.usbmodem*";
+    dir.setNameFilters(filters);
+    QStringList entries = dir.entryList(QDir::System, QDir::Name);
+    foreach (const QString &dev, entries) {
+        SymbianDeviceData *device = new SymbianDeviceData;
+        device->type = SerialPortCommunication;
+        device->portName = dir.filePath(dev);
+        device->friendlyName = tr("USB/Serial device (%1)").arg(device->portName);
+        rc.push_back(SymbianDevice(device));
+    }
+#endif
     return rc;
 }