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:
	src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp
	src/plugins/qmldesigner/components/stateseditornew/propertychangesmodel.cpp
	src/plugins/qmldesigner/components/stateseditornew/propertymodel.cpp
	src/plugins/qmldesigner/qmldesignerprojectmanager.cpp
	src/plugins/qmldesigner/qmldesignerprojectmanager.h

Change-Id: Ib029a830ee99190bc4ea2ad75d9300bfa86b42d9
This commit is contained in:
Tim Jenssen
2022-10-25 19:01:00 +02:00
parent 13f40f5471 0944bfb7f0
commit aa33927651
186 changed files with 2027 additions and 1207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1455,7 +1455,7 @@ private:
const FilePath targetDir = target.parentDir();
if (!m_checkedDirectories.contains(targetDir)) {
emit progress(tr("Creating directory: %1")
emit progress(tr("Creating directory: %1\n")
.arg(targetDir.toUserOutput()));
if (!targetDir.ensureWritableDir()) {
result.m_errorString = tr("Failed.");
@@ -1466,7 +1466,7 @@ private:
m_checkedDirectories.insert(targetDir);
}
emit progress(tr("Copying %1/%2: %3 -> %4")
emit progress(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.");