diff options
| author | Martin Storsjo <martin@martin.st> | 2011-06-24 13:00:19 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@accenture.com> | 2011-06-24 13:00:19 (GMT) |
| commit | 75c04d43cc8264f142d26f9524b325dbc362cae5 (patch) | |
| tree | 899cfaea666820959d3566447505e08903ac1f20 /tools/runonphone | |
| parent | c74b93df047157a6ff8ca3ffa2dd2f624760824f (diff) | |
| download | Qt-75c04d43cc8264f142d26f9524b325dbc362cae5.zip Qt-75c04d43cc8264f142d26f9524b325dbc362cae5.tar.gz Qt-75c04d43cc8264f142d26f9524b325dbc362cae5.tar.bz2 | |
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 <shane.kearns@accenture.com>
Diffstat (limited to 'tools/runonphone')
| -rw-r--r-- | tools/runonphone/serenum_unix.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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<SerialPortId> 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; |