whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace deleteRecursively function with QDir::removeRecursively 

Use QDir::removeRecursively instead of deleteRecursively when cleaning
up top-level build folders.

Change-Id: Ifb406fc1965a0781eab4fd63a3764a84f4309d25
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
bb10
Alexey Edelev 2021-10-15 11:20:12 +02:00 committed by Alexey Edelev
parent 3b51b8c31d
commit d273f38726
1 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/tools/androiddeployqt/main.cpp
View File

@ -63,23 +63,6 @@ static const bool mustReadOutputAnyway = true; // pclose seems to return the wro
static QStringList dependenciesForDepfile;
void deleteRecursively(const QString &dirName)
{
QDir dir(dirName);
if (!dir.exists())
return;
const QFileInfoList entries = dir.entryInfoList(QDir::NoDotAndDotDot | QDir::Files | QDir::Dirs);
for (const QFileInfo &entry : entries) {
if (entry.isDir())
deleteRecursively(entry.absoluteFilePath());
else
QFile::remove(entry.absoluteFilePath());
}
QDir().rmdir(dirName);
}
FILE *openProcess(const QString &command)
{
#if defined(Q_OS_WIN32)
@ -407,7 +390,7 @@ void deleteMissingFiles(const Options &options, const QDir &srcDir, const QDir &
fprintf(stdout, "%s not found in %s, removing it.\n", qPrintable(dst.fileName()), qPrintable(srcDir.absolutePath()));
if (dst.isDir())
deleteRecursively(dst.absolutePath());
QDir{dst.absolutePath()}.removeRecursively();
else
QFile::remove(dst.absoluteFilePath());
}