diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-04-19 10:05:48 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-04-19 10:05:48 (GMT) |
| commit | 63bf7cd581d9f69fecae82921d5c2c5b5eddc04a (patch) | |
| tree | 4c2c6eb507419f7d0dd9fdf6c1845a2ff1f65c04 /qmake | |
| parent | fda9cc1d8a0e49817d1c6192c52d18dffcecf327 (diff) | |
| download | Qt-63bf7cd581d9f69fecae82921d5c2c5b5eddc04a.zip Qt-63bf7cd581d9f69fecae82921d5c2c5b5eddc04a.tar.gz Qt-63bf7cd581d9f69fecae82921d5c2c5b5eddc04a.tar.bz2 | |
Fix wrong merge of 3aa39b0164ce4bb9e
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/makefile.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index 83d3adf..4f3b113 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -2901,7 +2901,7 @@ MakefileGenerator::fileFixify(const QString& file, const QString &out_d, const Q ret = "."; debug_msg(3, "Fixed[%d,%d] %s :: to :: %s [%s::%s] [%s::%s]", fix, canon, orig_file.toLatin1().constData(), ret.toLatin1().constData(), in_d.toLatin1().constData(), out_d.toLatin1().constData(), - pwd.toLatin1().constData(), Option::output_dir.toLatin1().constData()); + qmake_getpwd().toLatin1().constData(), Option::output_dir.toLatin1().constData()); return ret; } |