diff options
author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2014-11-27 14:13:30 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-02-04 16:32:53 +0000 |
commit | 924659b22f04a538f8b37838ad3bf5024fb931a6 (patch) | |
tree | a2fca9bafe9f360f39d4646c079685122028a7ae | |
parent | 7d04d8231957ff805405e50e06484aa6fc08bb4b (diff) |
don't re-implement QDir::mkpath()
Change-Id: Ic5cd5d3048c19047f22641698acbf678301d366e
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
-rw-r--r-- | qmake/generators/makefile.cpp | 36 |
1 files changed, 1 insertions, 35 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index d6b620111d..088756688e 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -92,41 +92,7 @@ bool MakefileGenerator::mkdir(const QString &in_path) const if(QFile::exists(path)) return true; - QDir d; - if(path.startsWith(QDir::separator())) { - d.cd(QString(QDir::separator())); - path.remove(0, 1); - } - bool ret = true; -#ifdef Q_OS_WIN - bool driveExists = true; - if(!QDir::isRelativePath(path)) { - if(QFile::exists(path.left(3))) { - d.cd(path.left(3)); - path.remove(0, 3); - } else { - warn_msg(WarnLogic, "Cannot access drive '%s' (%s)", - path.left(3).toLatin1().data(), path.toLatin1().data()); - driveExists = false; - } - } - if(driveExists) -#endif - { - QStringList subs = path.split(QDir::separator()); - for(QStringList::Iterator subit = subs.begin(); subit != subs.end(); ++subit) { - if(!d.cd(*subit)) { - d.mkdir((*subit)); - if(d.exists((*subit))) { - d.cd((*subit)); - } else { - ret = false; - break; - } - } - } - } - return ret; + return QDir().mkpath(path); } // ** base makefile generator |