diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-04-13 21:18:36 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-04-21 12:06:20 +0000 |
| commit | 4c96367410500c1b373a78cc3b5c6e07e8c998a5 (patch) | |
| tree | dd85decb58aa3c69f606e040c3d7a3bb5d0ab025 /qmake/generators/projectgenerator.cpp | |
| parent | 6234dec41f48383ea3fe848fa2b3f1de64e426ba (diff) | |
make fileFixify() calling convention somewhat sane
instead of allowing arbitrary input and output base paths, restrict them
to the project input and output dirs (in any permutation), which are the
only cases ever used anyway.
this permits much clearer call sites, and allows later optimizations.
Change-Id: I48d149a4417af5c858e66ec57c476a5bc6b17f17
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'qmake/generators/projectgenerator.cpp')
| -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 bcda1dbf0c..9b1796c45d 100644 --- a/qmake/generators/projectgenerator.cpp +++ b/qmake/generators/projectgenerator.cpp @@ -379,7 +379,7 @@ ProjectGenerator::addConfig(const QString &cfg, bool add) bool ProjectGenerator::addFile(QString file) { - file = fileFixify(file, qmake_getpwd()); + file = fileFixify(file, FileFixifyToIndir); QString dir; int s = file.lastIndexOf(Option::dir_sep); if(s != -1) |