diff options
| author | João Abecasis <joao@abecasis.name> | 2009-04-02 09:03:58 (GMT) |
|---|---|---|
| committer | João Abecasis <joao@abecasis.name> | 2009-04-02 14:29:49 (GMT) |
| commit | cfa31244eb9d16214360626723253d6a363a8d48 (patch) | |
| tree | fb6d5ccf49a32ca2dfee2c914295554e107d687d /qmake | |
| parent | 605746fd14ff68f19a806bb54882fb967fccc8e8 (diff) | |
| download | Qt-cfa31244eb9d16214360626723253d6a363a8d48.zip Qt-cfa31244eb9d16214360626723253d6a363a8d48.tar.gz Qt-cfa31244eb9d16214360626723253d6a363a8d48.tar.bz2 | |
Small changes in qmake's fileFixify
Removed dead code and simplified conditionals. This should not otherwise
change behavior or output of qmake in any way.
Reviewed-by: mariusSO
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/makefile.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index d0fbcbe..3e5452e 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -2735,16 +2735,9 @@ MakefileGenerator::fileFixify(const QString& file, const QString &out_d, const Q ret.prepend(pwd); ret = Option::fixPathToTargetOS(ret, false, canon); } else { //fix it.. - QString qfile(Option::fixPathToLocalOS(ret, true, canon)), in_dir(in_d), out_dir(out_d); + QString out_dir = QDir(Option::output_dir).absoluteFilePath(out_d); + QString in_dir = QDir(pwd).absoluteFilePath(in_d); { - if(out_dir.isNull() || QDir::isRelativePath(out_dir)) - out_dir.prepend(Option::output_dir + "/"); - else if(out_dir == ".") - out_dir = pwd; - if(in_dir.isEmpty() || QDir::isRelativePath(in_dir)) - in_dir.prepend(pwd); - else if(in_dir == ".") - in_dir = pwd; QFileInfo in_fi(fileInfo(in_dir)); if(in_fi.exists()) in_dir = in_fi.canonicalFilePath(); @@ -2753,6 +2746,7 @@ MakefileGenerator::fileFixify(const QString& file, const QString &out_d, const Q out_dir = out_fi.canonicalFilePath(); } + QString qfile(Option::fixPathToLocalOS(ret, true, canon)); QFileInfo qfileinfo(fileInfo(qfile)); if(out_dir != in_dir || !qfileinfo.isRelative()) { if(qfileinfo.isRelative()) { |