diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2013-03-07 15:13:09 +0200 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2013-03-07 15:52:35 +0100 |
| commit | be5c614b4899bf1549a15e9a724e1279269b1f82 (patch) | |
| tree | 5cdec474dfb863a8c41755719391f1c559b64e2f /src/app | |
| parent | b2a39399e9cc0c61c8d39aa9aa50342cf0db87d2 (diff) | |
| download | qt-creator-be5c614b4899bf1549a15e9a724e1279269b1f82.tar.gz | |
Enable -pid for qtcreator -client on Windows
Change-Id: Ib22674f77f68acc400966fc681953a384032f195
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/main.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/app/main.cpp b/src/app/main.cpp index 6257e5e367..71d00d320b 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -71,11 +71,8 @@ static const char fixedOptionsC[] = " -version Display program version\n" " -client Attempt to connect to already running first instance\n" " -settingspath <path> Override the default path where user settings are stored\n" -#if !defined(Q_OS_WIN) " -pid <pid> Attempt to connect to instance given by pid\n"; -#else -; -#endif + static const char HELP_OPTION1[] = "-h"; static const char HELP_OPTION2[] = "-help"; @@ -84,9 +81,7 @@ static const char HELP_OPTION4[] = "--help"; static const char VERSION_OPTION[] = "-version"; static const char CLIENT_OPTION[] = "-client"; static const char SETTINGS_OPTION[] = "-settingspath"; -#if !defined(Q_OS_WIN) static const char PID_OPTION[] = "-pid"; -#endif typedef QList<PluginSpec *> PluginSpecSet; @@ -413,9 +408,7 @@ int main(int argc, char **argv) appOptions.insert(QLatin1String(HELP_OPTION4), false); appOptions.insert(QLatin1String(VERSION_OPTION), false); appOptions.insert(QLatin1String(CLIENT_OPTION), false); -#if !defined(Q_OS_WIN) appOptions.insert(QLatin1String(PID_OPTION), true); -#endif QString errorMessage; if (!PluginManager::parseOptions(arguments, appOptions, &foundAppOptions, &errorMessage)) { displayError(errorMessage); @@ -455,7 +448,6 @@ int main(int argc, char **argv) } qint64 pid = -1; -#if !defined(Q_OS_WIN) if (foundAppOptions.contains(QLatin1String(PID_OPTION))) { QString pidString = foundAppOptions.value(QLatin1String(PID_OPTION)); bool pidOk; @@ -463,7 +455,6 @@ int main(int argc, char **argv) if (pidOk) pid = tmpPid; } -#endif if (app.isRunning() && (pid != -1 || foundAppOptions.contains(QLatin1String(CLIENT_OPTION)))) { if (app.sendMessage(PluginManager::serializedArguments(), 5000 /*timeout*/, pid)) |