From 0648decd6a5307be3ebf98ea891385989fecb1eb Mon Sep 17 00:00:00 2001 From: Rolland Dudemaine Date: Tue, 15 Nov 2011 17:28:22 +0100 Subject: Add relative path to the work directory, to prevent filename clashes. This was causing issues for some examples, which are all consistently using main.cpp as the entry file. Merge-request: 1438 Reviewed-by: Harald Fernengel --- qmake/generators/integrity/gbuild.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'qmake') diff --git a/qmake/generators/integrity/gbuild.cpp b/qmake/generators/integrity/gbuild.cpp index 0ca470d8bf..9b75fbc499 100644 --- a/qmake/generators/integrity/gbuild.cpp +++ b/qmake/generators/integrity/gbuild.cpp @@ -389,6 +389,8 @@ QString GBuildMakefileGenerator::writeOne(QString filename, QString pathtoremove s += "\t[MOC/Qt Header]\n"; s += "\t-o "; s += "work/"; + s += pathtoremove; + s += QDir::separator(); s += corename; s += "\n"; } else if (filename.section(QDir::separator(), -1).startsWith("qrc_")) { @@ -413,6 +415,8 @@ QString GBuildMakefileGenerator::writeOne(QString filename, QString pathtoremove s += " -o "; tmpstr.replace(Option::cpp_ext.first(), Option::cpp_moc_ext); s += "work/"; + s += pathtoremove; + s += QDir::separator(); s += tmpstr; s += "\n"; } else -- cgit v1.2.1