feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.9'

Browse Source 
Conflicts:
	doc/src/howto/creator-sidebar-views.qdoc
	doc/src/howto/creator-ui.qdoc
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/plugins/autotest/testresultmodel.cpp
	src/plugins/autotest/testresultmodel.h

Change-Id: I24cc585ca7782cb1d9cb0b8b73b46892b41937fd
This commit is contained in:
Eike Ziller
2019-05-08 12:41:25 +02:00
parent d0839bc1de 75e408584a
commit 4545c81e57
108 changed files with 1536 additions and 737 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libs/ssh/sftptransfer.cpp
View File

@@ -157,6 +157,7 @@ void SftpTransfer::doStart()
}
}
for (const FileToTransfer &f : d->files) {
QString sourceFileOrLinkTarget;
bool link = false;
if (d->transferType == Internal::FileTransferType::Upload) {
QFileInfo fi(f.sourceFile);
@@ -164,10 +165,13 @@ void SftpTransfer::doStart()
link = true;
d->batchFile.write("-rm " + QtcProcess::quoteArgUnix(f.targetFile).toLocal8Bit()
+ '\n');
sourceFileOrLinkTarget = fi.dir().relativeFilePath(fi.symLinkTarget()); // see QTBUG-5817.
} else {
sourceFileOrLinkTarget = f.sourceFile;
}
}
d->batchFile.write(d->transferCommand(link) + ' '
+ QtcProcess::quoteArgUnix(f.sourceFile).toLocal8Bit() + ' '
+ QtcProcess::quoteArgUnix(sourceFileOrLinkTarget).toLocal8Bit() + ' '
+ QtcProcess::quoteArgUnix(f.targetFile).toLocal8Bit() + '\n');
}
d->batchFile.flush();

6
src/libs/ssh/sshconnection.cpp
View File

@@ -36,7 +36,6 @@
#include <utils/fileutils.h>
#include <utils/hostosinfo.h>
#include <utils/qtcassert.h>
#include <utils/temporarydirectory.h>
#include <QByteArrayList>
#include <QDir>
@@ -149,7 +148,7 @@ struct SshConnection::SshConnectionPrivate
SshConnectionInfo connInfo;
SshProcess masterProcess;
QString errorString;
std::unique_ptr<TemporaryDirectory> masterSocketDir;
std::unique_ptr<QTemporaryDir> masterSocketDir;
State state = Unconnected;
const bool sharingEnabled = SshSettings::connectionSharingEnabled();
};
@@ -351,8 +350,7 @@ void SshConnection::doConnectToHost()
}
if (!d->sharingEnabled)
emitConnected();
QTC_ASSERT(TemporaryDirectory::masterTemporaryDirectory(), return);
d->masterSocketDir.reset(new TemporaryDirectory("ssh-XXXXXX"));
d->masterSocketDir.reset(new QTemporaryDir);
if (!d->masterSocketDir->isValid()) {
emitError(tr("Cannot establish SSH connection: Failed to create temporary "
"directory for control socket: %1")