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

Merge remote-tracking branch 'origin/13.0'

Browse Source 
Conflicts:
	src/plugins/android/androidsettingswidget.cpp

Change-Id: Ifcb16aa16c7bc2792de25d0ee7a22cf0e39a05f8
This commit is contained in:
Eike Ziller
2024-02-29 12:44:58 +01:00
parent 5af531cd39 49ab0c4109
commit 6c2df76737
104 changed files with 2545 additions and 1567 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/remotelinux/genericdeploystep.cpp
View File

@@ -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);