diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-20 20:35:02 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-20 20:35:02 (GMT) |
| commit | 15bf93ba9acf7dceef2a2b16d4664b172d264086 (patch) | |
| tree | 95cdcba70330c07a258071781b566c9a7726450a /tools/runonphone/main.cpp | |
| parent | 185388c0bf0f258d070376a2a3e50b9e89e1a249 (diff) | |
| parent | cd5e75810d59ab6e92c88189015aee77448160e4 (diff) | |
| download | Qt-15bf93ba9acf7dceef2a2b16d4664b172d264086.zip Qt-15bf93ba9acf7dceef2a2b16d4664b172d264086.tar.gz Qt-15bf93ba9acf7dceef2a2b16d4664b172d264086.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
1st attempt at USB serial port enumerator for linux
Corrected alphabetic order in the docs for events.
Implemented event filter functions for Symbian.
Diffstat (limited to 'tools/runonphone/main.cpp')
| -rw-r--r-- | tools/runonphone/main.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/runonphone/main.cpp b/tools/runonphone/main.cpp index d8c306f..c7fc43f 100644 --- a/tools/runonphone/main.cpp +++ b/tools/runonphone/main.cpp @@ -175,7 +175,11 @@ int main(int argc, char *argv[]) } if(loglevel > 0) outstream << "Connecting to target via " << serialPortName << endl; +#ifdef Q_OS_WIN launcher->setTrkServerName(QString("\\\\.\\") + serialPortName); +#else + launcher->setTrkServerName(serialPortName); +#endif launcher->setFileName(QString("c:\\sys\\bin\\") + exeFile); launcher->setCommandLineArgs(cmdLine); |