Merge remote-tracking branch 'origin/4.14'

Change-Id: I214b8d59e8ff7fe0511cd6116ec7725ddc4376ee
This commit is contained in:
Eike Ziller
2021-02-18 09:26:22 +01:00
11 changed files with 235 additions and 11 deletions

View File

@@ -216,9 +216,8 @@ bool FileUtils::copyRecursively(const FilePath &srcFilePath,
const QFileInfo srcFileInfo = srcFilePath.toFileInfo();
if (srcFileInfo.isDir()) {
if (!tgtFilePath.exists()) {
QDir targetDir(tgtFilePath.toString());
targetDir.cdUp();
if (!targetDir.mkdir(tgtFilePath.fileName())) {
const QDir targetDir(tgtFilePath.parentDir().toString());
if (!targetDir.mkpath(tgtFilePath.fileName())) {
if (error) {
*error = QCoreApplication::translate("Utils::FileUtils",
"Failed to create directory \"%1\".")