diff options
| author | hjk <hjk121@nokiamail.com> | 2014-02-05 10:43:21 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-02-19 09:19:28 +0100 |
| commit | c68ebeed2e47c7a78d790bb732a080edaf07d9ba (patch) | |
| tree | ab861674989f5b4aaf8f8f70275d53a2e075b0f2 /src/plugins/projectexplorer/processparameters.cpp | |
| parent | a0d29eeb03cfe51ed929a83374c18e3301fefdaf (diff) | |
| download | qt-creator-c68ebeed2e47c7a78d790bb732a080edaf07d9ba.tar.gz | |
QtcProcess: Introduce a QtcProcess::Arguments class
This is used to get a platform-agnostic handle on "command line
arguments". It essentially wraps a single QString on Windows,
and a QStringList everywhere else.
As a consequence, several occurrences of #ifdef Q_OS_*
can be removed from the codebase.
Change-Id: Ic93118c1bd0bce0ebb58f416d395dbaebb861772
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'src/plugins/projectexplorer/processparameters.cpp')
| -rw-r--r-- | src/plugins/projectexplorer/processparameters.cpp | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/plugins/projectexplorer/processparameters.cpp b/src/plugins/projectexplorer/processparameters.cpp index e702292c5c..711209b872 100644 --- a/src/plugins/projectexplorer/processparameters.cpp +++ b/src/plugins/projectexplorer/processparameters.cpp @@ -169,20 +169,12 @@ QString ProcessParameters::prettyArguments() const { QString margs = effectiveArguments(); QString workDir = effectiveWorkingDirectory(); -#ifdef Q_OS_WIN - QString args; -#else - QStringList args; -#endif Utils::QtcProcess::SplitError err; - args = Utils::QtcProcess::prepareArgs(margs, &err, &m_environment, &workDir); + Utils::QtcProcess::Arguments args = + Utils::QtcProcess::prepareArgs(margs, &err, Utils::HostOsInfo::hostOs(), &m_environment, &workDir); if (err != Utils::QtcProcess::SplitOk) return margs; // Sorry, too complex - just fall back. -#ifdef Q_OS_WIN - return args; -#else - return Utils::QtcProcess::joinArgs(args); -#endif + return args.toString(); } QString ProcessParameters::summary(const QString &displayName) const |