aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2024-02-27 12:53:59 +0100
committerChristian Kandeler <christian.kandeler@qt.io>2024-02-27 12:47:46 +0000
commit226806e0fbbd01d9967b34567dfdb10b1a170d87 (patch)
treecb6c4041fb59c587dacc7d9486c55f9189880df5
parenta57a925b76785c1269ca5bcbacd553f01c0f238d (diff)
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>
-rw-r--r--src/plugins/remotelinux/genericdeploystep.cpp15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/plugins/remotelinux/genericdeploystep.cpp b/src/plugins/remotelinux/genericdeploystep.cpp
index bddc7bfcd3..6071c4c8ca 100644
--- a/src/plugins/remotelinux/genericdeploystep.cpp
+++ b/src/plugins/remotelinux/genericdeploystep.cpp
@@ -155,11 +155,16 @@ GroupItem GenericDeployStep::transferTask(const Storage<FilesToTransfer> &storag
}
}
if (!m_emittedDowngradeWarning && transferMethod != preferredTransferMethod) {
- addWarningMessage(Tr::tr("Transfer method was downgraded from \"%1\" to \"%2\". If "
- "this is unexpected, please re-test device \"%3\".")
- .arg(FileTransfer::transferMethodName(preferredTransferMethod),
- FileTransfer::transferMethodName(transferMethod),
- deviceConfiguration()->displayName()));
+ const QString message
+ = Tr::tr("Transfer method was downgraded from \"%1\" to \"%2\". If "
+ "this is unexpected, please re-test device \"%3\".")
+ .arg(FileTransfer::transferMethodName(preferredTransferMethod),
+ FileTransfer::transferMethodName(transferMethod),
+ deviceConfiguration()->displayName());
+ if (transferMethod == FileTransferMethod::GenericCopy)
+ addWarningMessage(message);
+ else
+ addProgressMessage(message);
m_emittedDowngradeWarning = true;
}
transfer.setTransferMethod(transferMethod);