diff options
| author | Rolland Dudemaine <rolland@ghs.com> | 2011-11-15 16:28:22 (GMT) |
|---|---|---|
| committer | Harald Fernengel <harald.fernengel@nokia.com> | 2011-11-15 16:28:22 (GMT) |
| commit | 0648decd6a5307be3ebf98ea891385989fecb1eb (patch) | |
| tree | 5f97dc7404bd0207e21afe8b386ea179036c7ab3 /qmake | |
| parent | ea39013a5401866367e4a0deccfcf58256bdaaa2 (diff) | |
| download | Qt-0648decd6a5307be3ebf98ea891385989fecb1eb.zip Qt-0648decd6a5307be3ebf98ea891385989fecb1eb.tar.gz Qt-0648decd6a5307be3ebf98ea891385989fecb1eb.tar.bz2 | |
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 <harald.fernengel@nokia.com>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/integrity/gbuild.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/qmake/generators/integrity/gbuild.cpp b/qmake/generators/integrity/gbuild.cpp index 0ca470d..9b75fbc 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 |