Skip to content

Commit

Permalink
Fix wrong merge of 3aa39b0
Browse files Browse the repository at this point in the history
ogoffart committed Apr 19, 2011
1 parent fda9cc1 commit 63bf7cd
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion qmake/generators/makefile.cpp
Original file line number Diff line number Diff line change
@@ -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;
}

0 comments on commit 63bf7cd

Please sign in to comment.