diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2022-10-25 19:01:00 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2022-10-25 19:02:15 +0200 |
| commit | aa339276515da0b8c40193813de00d3cebfa1a3b (patch) | |
| tree | 29b6085b38522b9a129be587d40ddb86a7ee08e6 /src/plugins/remotelinux | |
| parent | 13f40f5471e55757a2cf9bba8d052750a2f2a753 (diff) | |
| parent | 0944bfb7f08ff3bc8ec7f0af922ec65f54fa866c (diff) | |
| download | qt-creator-aa339276515da0b8c40193813de00d3cebfa1a3b.tar.gz | |
Merge remote-tracking branch 'origin/9.0'
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
Diffstat (limited to 'src/plugins/remotelinux')
| -rw-r--r-- | src/plugins/remotelinux/linuxdevice.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/remotelinux/linuxdevice.cpp b/src/plugins/remotelinux/linuxdevice.cpp index 5b81784f7a..0734b649c6 100644 --- a/src/plugins/remotelinux/linuxdevice.cpp +++ b/src/plugins/remotelinux/linuxdevice.cpp @@ -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."); |