diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-05-08 12:41:25 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-05-08 12:41:25 +0200 |
| commit | 4545c81e570c477ae8821531dcfd593e09f950b0 (patch) | |
| tree | f756738ffaf55210a2aa1596407eeed94e504ae7 /src/plugins/remotelinux | |
| parent | d0839bc1de52acd0902364565b6f9d030e591646 (diff) | |
| parent | 75e408584ac9a60c3a4dd714f5620814485fcdca (diff) | |
| download | qt-creator-4545c81e570c477ae8821531dcfd593e09f950b0.tar.gz | |
Merge remote-tracking branch 'origin/4.9'
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
Diffstat (limited to 'src/plugins/remotelinux')
| -rw-r--r-- | src/plugins/remotelinux/genericdirectuploadservice.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/remotelinux/remotelinuxcustomrunconfiguration.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/remotelinux/rsyncdeploystep.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/remotelinux/genericdirectuploadservice.cpp b/src/plugins/remotelinux/genericdirectuploadservice.cpp index e07c819275..014ed5db62 100644 --- a/src/plugins/remotelinux/genericdirectuploadservice.cpp +++ b/src/plugins/remotelinux/genericdirectuploadservice.cpp @@ -153,12 +153,12 @@ QDateTime GenericDirectUploadService::timestampFromStat(const DeployableFile &fi return QDateTime(); } const QByteArrayList columns = output.mid(file.remoteFilePath().toUtf8().size() + 1).split(' '); - if (columns.size() < 15) { // Normal Linux stat: 16 columns, busybox stat: 15 columns + if (columns.size() < 14) { // Normal Linux stat: 16 columns in total, busybox stat: 15 columns emit warningMessage(warningString); return QDateTime(); } bool isNumber; - const qint64 secsSinceEpoch = columns.at(12).toLongLong(&isNumber); + const qint64 secsSinceEpoch = columns.at(11).toLongLong(&isNumber); if (!isNumber) { emit warningMessage(warningString); return QDateTime(); diff --git a/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.cpp b/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.cpp index 1d492b88e2..a375716aab 100644 --- a/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.cpp +++ b/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.cpp @@ -105,8 +105,8 @@ QString RemoteLinuxCustomRunConfiguration::runConfigDefaultDisplayName() Runnable RemoteLinuxCustomRunConfiguration::runnable() const { ProjectExplorer::Runnable r = RunConfiguration::runnable(); - r.extraData.insert("Ssh.X11ForwardToDisplay", - aspect<X11ForwardingAspect>()->display(macroExpander())); + if (const auto * const forwardingAspect = aspect<X11ForwardingAspect>()) + r.extraData.insert("Ssh.X11ForwardToDisplay", forwardingAspect->display(macroExpander())); return r; } diff --git a/src/plugins/remotelinux/rsyncdeploystep.cpp b/src/plugins/remotelinux/rsyncdeploystep.cpp index 25c0e12207..8c0900d750 100644 --- a/src/plugins/remotelinux/rsyncdeploystep.cpp +++ b/src/plugins/remotelinux/rsyncdeploystep.cpp @@ -232,7 +232,7 @@ RsyncCommandLine RsyncDeployStep::rsyncCommand(const SshConnection &sshConnectio QStringList{SshSettings::sshFilePath().toUserOutput()} << sshConnection.connectionOptions()); const SshConnectionParameters sshParams = sshConnection.connectionParameters(); - return RsyncCommandLine(QStringList{"-e", sshCmdLine, "-avz"}, + return RsyncCommandLine(QStringList{"-e", sshCmdLine, "-av"}, sshParams.userName() + '@' + sshParams.host()); } |