diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-04-17 10:09:35 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-04-17 10:09:35 +0200 |
| commit | 185fe0c705ceb01f06ba600e053ef8a2fc3f60ba (patch) | |
| tree | f4cfa8ef2337cdc87ab3cfbfcfeaca196ecf5234 /src/plugins/remotelinux | |
| parent | 32a219f5c1f8d9b967b1a42018fb318216345e12 (diff) | |
| parent | 9a946decc3d516ad4210fb06cb2c93489a2a44c8 (diff) | |
| download | qt-creator-185fe0c705ceb01f06ba600e053ef8a2fc3f60ba.tar.gz | |
Merge remote-tracking branch 'origin/4.6'
Conflicts:
src/plugins/android/androidrunnable.h
src/plugins/android/androidrunner.cpp
src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.cpp
src/plugins/qmakeprojectmanager/qmakeproject.cpp
src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp
Change-Id: I68093d44cfd672347eab82459ff70c21a32297ce
Diffstat (limited to 'src/plugins/remotelinux')
| -rw-r--r-- | src/plugins/remotelinux/remotelinuxqmltoolingsupport.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/plugins/remotelinux/remotelinuxqmltoolingsupport.cpp b/src/plugins/remotelinux/remotelinuxqmltoolingsupport.cpp index 836ab11fd5..933c91f476 100644 --- a/src/plugins/remotelinux/remotelinuxqmltoolingsupport.cpp +++ b/src/plugins/remotelinux/remotelinuxqmltoolingsupport.cpp @@ -28,6 +28,7 @@ #include <projectexplorer/runnables.h> #include <ssh/sshconnection.h> +#include <utils/qtcprocess.h> #include <utils/url.h> using namespace ProjectExplorer; @@ -66,11 +67,9 @@ void RemoteLinuxQmlToolingSupport::start() serverUrl.setPort(qmlPort.number()); m_runworker->recordData("QmlServerUrl", serverUrl); - QString args = QmlDebug::qmlDebugTcpArguments(m_services, qmlPort); auto r = runnable().as<StandardRunnable>(); - if (!r.commandLineArguments.isEmpty()) - r.commandLineArguments.append(' '); - r.commandLineArguments += args; + QtcProcess::addArg(&r.commandLineArguments, QmlDebug::qmlDebugTcpArguments(m_services, qmlPort), + device()->osType()); setRunnable(r); |