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

Utils: Use FilePath in copy helpers

Browse Source 
Change-Id: I81b367a5851c0fbcdf45c63c5536c206845a8337
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2021-08-09 08:53:40 +02:00
parent c179ce867c
commit 2ab2d96753
5 changed files with 33 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/cpptools/cpptoolstestcase.cpp
View File

@@ -322,20 +322,18 @@ static bool copyRecursively(const QString &sourceDirPath,
const QString &targetDirPath,
QString *error)
{
auto copyHelper = [](QFileInfo sourceInfo, QFileInfo targetInfo, QString *error) -> bool {
const QString sourcePath = sourceInfo.absoluteFilePath();
const QString targetPath = targetInfo.absoluteFilePath();
if (!QFile::copy(sourcePath, targetPath)) {
auto copyHelper = [](const FilePath &sourcePath, const FilePath &targetPath, QString *error) -> bool {
if (!sourcePath.copyFile(targetPath)) {
if (error) {
*error = QString::fromLatin1("copyRecursively() failed: \"%1\" to \"%2\".")
.arg(sourcePath, targetPath);
.arg(sourcePath.toUserOutput(), targetPath.toUserOutput());
}
return false;
}
// Copied files from Qt resources are read-only. Make them writable
// so that their parent directory can be removed without warnings.
QFile file(targetPath);
QFile file(targetPath.toString());
return file.setPermissions(file.permissions() | QFile::WriteUser);
};