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

Merge remote-tracking branch 'origin/9.0'

Browse Source 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp

Change-Id: I154a9ababa9e166cb06e98652d481fe6234f6399
This commit is contained in:
Eike Ziller
2022-11-03 13:44:37 +01:00
parent 079906a122 8de9892c4e
commit 68388a38dd
206 changed files with 2160 additions and 1321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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