diff --git a/src/app/main.cpp b/src/app/main.cpp index 6257e5e367f..71d00d320b5 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 Override the default path where user settings are stored\n" -#if !defined(Q_OS_WIN) " -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 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))