From 75c04d43cc8264f142d26f9524b325dbc362cae5 Mon Sep 17 00:00:00 2001 From: Martin Storsjo Date: Fri, 24 Jun 2011 14:00:19 +0100 Subject: runonphone: Include the manufacturer name in the friendly name on OS X This helps automatic detection of devices such as N8-00, that don't include Nokia in the product name (while devices from earlier generations did include it, such as "Nokia 5800 XpressMusic"). Merge-request: 2633 Reviewed-by: Shane Kearns --- tools/runonphone/serenum_unix.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/runonphone/serenum_unix.cpp b/tools/runonphone/serenum_unix.cpp index d0e7665..9a33dab 100644 --- a/tools/runonphone/serenum_unix.cpp +++ b/tools/runonphone/serenum_unix.cpp @@ -190,7 +190,8 @@ QList enumerateSerialPorts(int loglevel) if (loglevel > 1) qDebug() << " found device file:" << info.fileName() << endl; #ifdef Q_OS_MAC - friendlyName = eligibleInterfacesInfo[eligibleInterfaces.indexOf(iface)].product; + InterfaceInfo info = eligibleInterfacesInfo[eligibleInterfaces.indexOf(iface)]; + friendlyName = info.manufacturer + " " + info.product; #endif usable = true; break; -- cgit v0.12