From f846e488dd0157dde35c0d750fcc6b083602ec63 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Thu, 19 Oct 2017 17:57:29 +0200 Subject: [PATCH] ProjectExplorer: Make sure toolControlChannel URLs come with a scheme QML Profiler won't accept URLs without schemes anymore. Change-Id: I54995ae7e9c1bcdb9f55fe5d56a45931f14cf890 Reviewed-by: hjk --- src/plugins/android/androiddevice.cpp | 1 + src/plugins/projectexplorer/devicesupport/desktopdevice.cpp | 1 + src/plugins/projectexplorer/devicesupport/idevice.cpp | 1 + 3 files changed, 3 insertions(+) diff --git a/src/plugins/android/androiddevice.cpp b/src/plugins/android/androiddevice.cpp index 65e767b8d52..f866668856e 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 875fdb29d85..074bbc5410a 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 4736e26e85e..985a3d326ee 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; }