From 4c96367410500c1b373a78cc3b5c6e07e8c998a5 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 13 Apr 2015 21:18:36 +0200 Subject: 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 --- qmake/generators/projectgenerator.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qmake/generators/projectgenerator.cpp') 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) -- cgit v1.2.3