forked from qt-creator/qt-creator
RemoteLinux: Make deployment downgrade warning less spammy
Keep the message, but make it a warning only for the "generic copy" case, which almost no one ever wants. Otherwise, it will annoy Windows users, who typically have no rsync installed. Change-Id: I2044b9ea2b199e03dc4e9421d05a2698d92ad76a Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
@@ -155,11 +155,16 @@ GroupItem GenericDeployStep::transferTask(const Storage<FilesToTransfer> &storag
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!m_emittedDowngradeWarning && transferMethod != preferredTransferMethod) {
|
if (!m_emittedDowngradeWarning && transferMethod != preferredTransferMethod) {
|
||||||
addWarningMessage(Tr::tr("Transfer method was downgraded from \"%1\" to \"%2\". If "
|
const QString message
|
||||||
|
= Tr::tr("Transfer method was downgraded from \"%1\" to \"%2\". If "
|
||||||
"this is unexpected, please re-test device \"%3\".")
|
"this is unexpected, please re-test device \"%3\".")
|
||||||
.arg(FileTransfer::transferMethodName(preferredTransferMethod),
|
.arg(FileTransfer::transferMethodName(preferredTransferMethod),
|
||||||
FileTransfer::transferMethodName(transferMethod),
|
FileTransfer::transferMethodName(transferMethod),
|
||||||
deviceConfiguration()->displayName()));
|
deviceConfiguration()->displayName());
|
||||||
|
if (transferMethod == FileTransferMethod::GenericCopy)
|
||||||
|
addWarningMessage(message);
|
||||||
|
else
|
||||||
|
addProgressMessage(message);
|
||||||
m_emittedDowngradeWarning = true;
|
m_emittedDowngradeWarning = true;
|
||||||
}
|
}
|
||||||
transfer.setTransferMethod(transferMethod);
|
transfer.setTransferMethod(transferMethod);
|
||||||
|
Reference in New Issue
Block a user