diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2017-10-19 17:57:29 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2017-10-19 16:26:21 +0000 |
| commit | f846e488dd0157dde35c0d750fcc6b083602ec63 (patch) | |
| tree | c2aec9f01e96e99160c7f57e0c400b64365d0b15 | |
| parent | f1a4a10cfea95833f5591b557357b23832d38a0d (diff) | |
| download | qt-creator-f846e488dd0157dde35c0d750fcc6b083602ec63.tar.gz | |
ProjectExplorer: Make sure toolControlChannel URLs come with a scheme
QML Profiler won't accept URLs without schemes anymore.
Change-Id: I54995ae7e9c1bcdb9f55fe5d56a45931f14cf890
Reviewed-by: hjk <hjk@qt.io>
| -rw-r--r-- | src/plugins/android/androiddevice.cpp | 1 | ||||
| -rw-r--r-- | src/plugins/projectexplorer/devicesupport/desktopdevice.cpp | 1 | ||||
| -rw-r--r-- | src/plugins/projectexplorer/devicesupport/idevice.cpp | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/android/androiddevice.cpp b/src/plugins/android/androiddevice.cpp index 65e767b8d5..f866668856 100644 --- a/src/plugins/android/androiddevice.cpp +++ b/src/plugins/android/androiddevice.cpp @@ -107,6 +107,7 @@ IDevice::Ptr AndroidDevice::clone() const QUrl AndroidDevice::toolControlChannel(const ControlChannelHint &) const { QUrl url; + url.setScheme(urlTcpScheme()); url.setHost("localhost"); return url; } diff --git a/src/plugins/projectexplorer/devicesupport/desktopdevice.cpp b/src/plugins/projectexplorer/devicesupport/desktopdevice.cpp index 875fdb29d8..074bbc5410 100644 --- a/src/plugins/projectexplorer/devicesupport/desktopdevice.cpp +++ b/src/plugins/projectexplorer/devicesupport/desktopdevice.cpp @@ -186,6 +186,7 @@ PortsGatheringMethod::Ptr DesktopDevice::portsGatheringMethod() const QUrl DesktopDevice::toolControlChannel(const ControlChannelHint &) const { QUrl url; + url.setScheme(urlTcpScheme()); url.setHost("localhost"); return url; } diff --git a/src/plugins/projectexplorer/devicesupport/idevice.cpp b/src/plugins/projectexplorer/devicesupport/idevice.cpp index 4736e26e85..985a3d326e 100644 --- a/src/plugins/projectexplorer/devicesupport/idevice.cpp +++ b/src/plugins/projectexplorer/devicesupport/idevice.cpp @@ -414,6 +414,7 @@ void IDevice::setSshParameters(const QSsh::SshConnectionParameters &sshParameter QUrl IDevice::toolControlChannel(const ControlChannelHint &) const { QUrl url; + url.setScheme(urlTcpScheme()); url.setHost(d->sshParameters.host); return url; } |