diff options
| author | Shane Kearns <shane.kearns@accenture.com> | 2010-07-09 10:16:35 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@accenture.com> | 2010-07-09 12:37:09 (GMT) |
| commit | 767aa8d648bf81a3303da66a4fef98657ea5ece3 (patch) | |
| tree | 79a7899be5e77ac75b43f89fcd9905009be9c6f0 /tools/runonphone/serenum_win.cpp | |
| parent | c950283638f05176f80b1fc6711a5340184e25e3 (diff) | |
| download | Qt-767aa8d648bf81a3303da66a4fef98657ea5ece3.zip Qt-767aa8d648bf81a3303da66a4fef98657ea5ece3.tar.gz Qt-767aa8d648bf81a3303da66a4fef98657ea5ece3.tar.bz2 | |
Fix USB serial port detection of the Nokia N95 on linux
The interface numbers in /dev/serial/by-id are hex rather than decimal.
Also added code to read the manufacturer name and product name from string descriptors
in order to get a better match. Unfortunately, root privilege is needed or the API
returns an error.
In this case, we still use the weak matching on interface number only.
Task-Number: QTBUG-11794
Reviewed-By: Thomas Zander
Diffstat (limited to 'tools/runonphone/serenum_win.cpp')
| -rw-r--r-- | tools/runonphone/serenum_win.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/runonphone/serenum_win.cpp b/tools/runonphone/serenum_win.cpp index 572161c..070cac2 100644 --- a/tools/runonphone/serenum_win.cpp +++ b/tools/runonphone/serenum_win.cpp @@ -53,7 +53,7 @@ //{4d36e978-e325-11ce-bfc1-08002be10318} //DEFINE_GUID(GUID_DEVCLASS_PORTS, 0x4D36E978, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18 ); -QList<SerialPortId> enumerateSerialPorts() +QList<SerialPortId> enumerateSerialPorts(int) { DWORD index=0; SP_DEVINFO_DATA info; |