From de712c6ba910e7a5bb34b75ca1523b84155f8251 Mon Sep 17 00:00:00 2001 From: "Vladimir Golovnev (Glassez)" Date: Wed, 17 Jun 2015 19:18:35 +0300 Subject: [PATCH] Use native QDir::removeRecursively() in Qt5. --- src/core/utils/fs.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/core/utils/fs.cpp b/src/core/utils/fs.cpp index 90e302952..6a0c5d687 100644 --- a/src/core/utils/fs.cpp +++ b/src/core/utils/fs.cpp @@ -182,7 +182,11 @@ bool Utils::Fs::forceRemove(const QString& file_path) * Removes directory and its content recursively. * */ -void Utils::Fs::removeDirRecursive(const QString& dirName) { +void Utils::Fs::removeDirRecursive(const QString& dirName) +{ +#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) + QDir(dirName).removeRecursively(); +#else QDir dir(dirName); if (!dir.exists()) return; @@ -197,6 +201,7 @@ void Utils::Fs::removeDirRecursive(const QString& dirName) { } dir.rmdir(dirName); +#endif } /**