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

Fix lupdate error

Browse Source 
GenericTransferImpl doesn't have a translation context and RemoteLinux
was changed to Tr::tr anyway.

Amends b323303518

Change-Id: I048cae28684e223ab1547a5e07d1aaf9bb46c73e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Eike Ziller
2022-10-31 14:50:30 +01:00
parent eb0649ba05
commit d9503cdf89
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/remotelinux/linuxdevice.cpp
View File

@@ -1458,10 +1458,9 @@ private:
const FilePath targetDir = target.parentDir(); const FilePath targetDir = target.parentDir();
if (!m_checkedDirectories.contains(targetDir)) { if (!m_checkedDirectories.contains(targetDir)) {
emit progress(tr("Creating directory: %1\n") emit progress(Tr::tr("Creating directory: %1\n").arg(targetDir.toUserOutput()));
.arg(targetDir.toUserOutput()));
if (!targetDir.ensureWritableDir()) { if (!targetDir.ensureWritableDir()) {
result.m_errorString = tr("Failed."); result.m_errorString = Tr::tr("Failed.");
result.m_exitCode = -1; // Random pick result.m_exitCode = -1; // Random pick
emit done(result); emit done(result);
return; return;
@@ -1469,10 +1468,12 @@ private:
m_checkedDirectories.insert(targetDir); m_checkedDirectories.insert(targetDir);
} }
emit progress(tr("Copying %1/%2: %3 -> %4\n") emit progress(Tr::tr("Copying %1/%2: %3 -> %4\n")
.arg(m_currentIndex).arg(m_fileCount).arg(source.toUserOutput(), target.toUserOutput())); .arg(m_currentIndex)
.arg(m_fileCount)
.arg(source.toUserOutput(), target.toUserOutput()));
if (!source.copyFile(target)) { if (!source.copyFile(target)) {
result.m_errorString = tr("Failed."); result.m_errorString = Tr::tr("Failed.");
result.m_exitCode = -1; // Random pick result.m_exitCode = -1; // Random pick
emit done(result); emit done(result);
return; return;