Merge remote-tracking branch 'origin/12.0'

 Conflicts:
	src/plugins/clangcodemodel/clangdfollowsymbol.cpp
	src/plugins/debugger/debuggerruncontrol.cpp
	src/plugins/projectexplorer/miniprojecttargetselector.cpp

Change-Id: I45b7fee1a1d784c44f2139fb1ede69190d23d6fd

2 files changed, 7 insertions, 0 deletions

diff --git a/src/plugins/boot2qt/device-detection/devicedetector.cpp b/src/plugins/boot2qt/device-detection/devicedetector.cpp
index 10faa4fb3c..abe06bc566 100644
--- a/src/plugins/boot2qt/device-detection/devicedetector.cpp
+++ b/src/plugins/boot2qt/device-detection/devicedetector.cpp
@@ -9,6 +9,7 @@
 #include "../qdbutils.h"
 
 #include <projectexplorer/devicesupport/devicemanager.h>
+#include <projectexplorer/projectexplorerconstants.h>
 
 #include <utils/qtcassert.h>
 
@@ -85,6 +86,8 @@ void DeviceDetector::handleDeviceEvent(QdbDeviceTracker::DeviceEventType eventTy
         device->settings()->displayName.setValue(name);
         device->setType(Qdb::Constants::QdbLinuxOsType);
         device->setMachineType(IDevice::Hardware);
+        device->setExtraData(ProjectExplorer::Constants::SUPPORTS_RSYNC, true);
+        device->setExtraData(ProjectExplorer::Constants::SUPPORTS_SFTP, true);
 
         const QString ipAddress = info["ipAddress"];
         device->setupDefaultNetworkSettings(ipAddress);
diff --git a/src/plugins/boot2qt/qdbplugin.cpp b/src/plugins/boot2qt/qdbplugin.cpp
index df1b5458f3..35e1c71514 100644
--- a/src/plugins/boot2qt/qdbplugin.cpp
+++ b/src/plugins/boot2qt/qdbplugin.cpp
@@ -115,7 +115,11 @@ public:
                    && prj->hasMakeInstallEquivalent();
         });
         addInitialStep(Qdb::Constants::QdbStopApplicationStepId);
+#ifdef Q_OS_WIN
+        addInitialStep(RemoteLinux::Constants::DirectUploadStepId);
+#else
         addInitialStep(RemoteLinux::Constants::GenericDeployStepId);
+#endif
     }
 };