diff options
| author | hjk <hjk@theqtcompany.com> | 2016-01-06 16:50:36 +0100 |
|---|---|---|
| committer | hjk <hjk@theqtcompany.com> | 2016-01-18 16:35:40 +0000 |
| commit | e7956000df038731957d488c4c0a68a4c7813f2d (patch) | |
| tree | 351d4196cd26eca6c3abac366a726509f1719f44 /src/plugins/remotelinux/remotelinuxrunconfiguration.cpp | |
| parent | 9a0062a9428b7cc013f9cd24c6f7f095f360b525 (diff) | |
| download | qt-creator-e7956000df038731957d488c4c0a68a4c7813f2d.tar.gz | |
RemoteLinux: Use QString instead of QStringList for process arguments
This is almost uniformly used everywhere else.
Change-Id: I1ef9abb24066b21652aeb994b18ea3e19f48b3c6
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Diffstat (limited to 'src/plugins/remotelinux/remotelinuxrunconfiguration.cpp')
| -rw-r--r-- | src/plugins/remotelinux/remotelinuxrunconfiguration.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp index 38a08e9af2..3878583917 100644 --- a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp +++ b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp @@ -72,7 +72,7 @@ public: } QString targetName; - QStringList arguments; + QString arguments; bool useAlternateRemoteExecutable; QString alternateRemoteExecutable; QString workingDirectory; @@ -147,7 +147,11 @@ bool RemoteLinuxRunConfiguration::fromMap(const QVariantMap &map) if (!RunConfiguration::fromMap(map)) return false; - d->arguments = map.value(QLatin1String(ArgumentsKey)).toStringList(); + QVariant args = map.value(QLatin1String(ArgumentsKey)); + if (args.type() == QVariant::StringList) // Until 3.7 a QStringList was stored. + d->arguments = QtcProcess::joinArgs(args.toStringList(), OsTypeLinux); + else + d->arguments = args.toString(); d->targetName = map.value(QLatin1String(TargetNameKey)).toString(); d->useAlternateRemoteExecutable = map.value(QLatin1String(UseAlternateExeKey), false).toBool(); d->alternateRemoteExecutable = map.value(QLatin1String(AlternateExeKey)).toString(); @@ -167,7 +171,7 @@ QString RemoteLinuxRunConfiguration::defaultDisplayName() return tr("Run on Remote Device"); } -QStringList RemoteLinuxRunConfiguration::arguments() const +QString RemoteLinuxRunConfiguration::arguments() const { return d->arguments; } @@ -198,7 +202,7 @@ QString RemoteLinuxRunConfiguration::remoteExecutableFilePath() const void RemoteLinuxRunConfiguration::setArguments(const QString &args) { - d->arguments = QtcProcess::splitArgs(args, OsTypeLinux); // TODO: Widget should be list-based. + d->arguments = args; } QString RemoteLinuxRunConfiguration::workingDirectory() const |