Merge pull request #3245 from glassez/upgrade

Upgrade to v3.3
This commit is contained in:
sledgehammer999 2015-06-20 16:33:32 +03:00
commit 627d74233b
5 changed files with 147 additions and 2 deletions

View file

@ -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
}
/**