diff options
author | Jesus Fernandez <jesus.fernandez@qt.io> | 2016-12-12 12:57:47 +0100 |
---|---|---|
committer | Jesus Fernandez <jesus.fernandez@qt.io> | 2017-01-23 13:20:42 +0000 |
commit | decab46c235bf9be355879f285022e92e88aa6b1 (patch) | |
tree | 52563d9e68fec0526010c367a82b2e97a4ef42cf /qmake/generators | |
parent | 7dc88b68904c7f1b7e012bd65ccdcbf48cc6e2e0 (diff) |
Fix qmake -project in an empty folder
Avoids iterating over the entire filesystem.
Task-number: QTBUG-57569
Change-Id: If089842553978843de73559d1b1a567aa322a047
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'qmake/generators')
-rw-r--r-- | qmake/generators/projectgenerator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/projectgenerator.cpp b/qmake/generators/projectgenerator.cpp index a050e3dc9b..d4532315d0 100644 --- a/qmake/generators/projectgenerator.cpp +++ b/qmake/generators/projectgenerator.cpp @@ -150,7 +150,7 @@ ProjectGenerator::init() QString newdir = pd; QFileInfo fi(fileInfo(newdir)); if(fi.isDir()) { - newdir = fileFixify(newdir); + newdir = fileFixify(newdir, FileFixifyFromOutdir); ProStringList &subdirs = v["SUBDIRS"]; if(exists(fi.filePath() + QDir::separator() + fi.fileName() + Option::pro_ext) && !subdirs.contains(newdir, Qt::CaseInsensitive)) { |