Merge remote-tracking branch 'origin/11.0'

Change-Id: I6c2a1d497aae9bda45c4aae47fb0be6c61c1ec29

4 files changed, 15 insertions, 5 deletions

diff --git a/src/plugins/cmakeprojectmanager/fileapiparser.cpp b/src/plugins/cmakeprojectmanager/fileapiparser.cpp
index 921df86841..1998cc06df 100644
--- a/src/plugins/cmakeprojectmanager/fileapiparser.cpp
+++ b/src/plugins/cmakeprojectmanager/fileapiparser.cpp
@@ -841,7 +841,6 @@ FileApiData FileApiParser::parseData(QPromise<std::shared_ptr<FileApiQtcData>> &
                                      QString &errorMessage)
 {
     QTC_CHECK(errorMessage.isEmpty());
-    QTC_CHECK(!replyFilePath.needsDevice());
     const FilePath replyDir = replyFilePath.parentDir();
 
     FileApiData result;
diff --git a/src/plugins/projectexplorer/kitaspects.cpp b/src/plugins/projectexplorer/kitaspects.cpp
index d0dea8501e..825af13628 100644
--- a/src/plugins/projectexplorer/kitaspects.cpp
+++ b/src/plugins/projectexplorer/kitaspects.cpp
@@ -162,7 +162,7 @@ FilePath SysRootKitAspect::sysRoot(const Kit *k)
         return {};
 
     if (!k->value(SysRootKitAspect::id()).toString().isEmpty())
-        return FilePath::fromString(k->value(SysRootKitAspect::id()).toString());
+        return FilePath::fromSettings(k->value(SysRootKitAspect::id()));
 
     for (ToolChain *tc : ToolChainKitAspect::toolChains(k)) {
         if (!tc->sysRoot().isEmpty())
diff --git a/src/plugins/projectexplorer/taskwindow.cpp b/src/plugins/projectexplorer/taskwindow.cpp
index c829e4f087..7416c383e7 100644
--- a/src/plugins/projectexplorer/taskwindow.cpp
+++ b/src/plugins/projectexplorer/taskwindow.cpp
@@ -618,6 +618,7 @@ void TaskDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option,
 
     painter->save();
     m_doc.setHtml(options.text);
+    m_doc.setTextWidth(options.rect.width());
     options.text = "";
     options.widget->style()->drawControl(QStyle::CE_ItemViewItem, &options, painter);
     painter->translate(options.rect.left(), options.rect.top());
@@ -645,9 +646,12 @@ QSize TaskDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelInd
         return QStyledItemDelegate::sizeHint(option, index);
 
     QStyleOptionViewItem options = option;
+    options.initFrom(options.widget);
     initStyleOption(&options, index);
     m_doc.setHtml(options.text);
-    m_doc.setTextWidth(options.rect.width());
+    const auto view = qobject_cast<const QTreeView *>(options.widget);
+    QTC_ASSERT(view, return {});
+    m_doc.setTextWidth(view->width() * 0.85 - view->indentation());
     return QSize(m_doc.idealWidth(), m_doc.size().height());
 }
 
diff --git a/src/plugins/remotelinux/linuxdevice.cpp b/src/plugins/remotelinux/linuxdevice.cpp
index ce233f2e46..4e4f5f73bb 100644
--- a/src/plugins/remotelinux/linuxdevice.cpp
+++ b/src/plugins/remotelinux/linuxdevice.cpp
@@ -1279,8 +1279,10 @@ private:
         QByteArray batchData;
 
         const FilePaths dirs = dirsToCreate(m_setup.m_files);
-        for (const FilePath &dir : dirs)
-            batchData += "-mkdir " + ProcessArgs::quoteArgUnix(dir.path()).toLocal8Bit() + '\n';
+        for (const FilePath &dir : dirs) {
+            if (!dir.exists())
+                batchData += "-mkdir " + ProcessArgs::quoteArgUnix(dir.path()).toLocal8Bit() + '\n';
+        }
 
         for (const FileToTransfer &file : m_setup.m_files) {
             FilePath sourceFileOrLinkTarget = file.m_source;
@@ -1454,6 +1456,11 @@ private:
 FileTransferInterface *LinuxDevice::createFileTransferInterface(
         const FileTransferSetupData &setup) const
 {
+    if (Utils::anyOf(setup.m_files,
+                     [](const FileToTransfer &f) { return f.m_source.needsDevice(); })) {
+        return new GenericTransferImpl(setup);
+    }
+
     switch (setup.m_method) {
     case FileTransferMethod::Sftp:  return new SftpTransferImpl(setup, sharedFromThis());
     case FileTransferMethod::Rsync: return new RsyncTransferImpl(setup, sharedFromThis());