diff options
| author | Rolland Dudemaine <rolland@ghs.com> | 2011-11-15 16:28:19 (GMT) |
|---|---|---|
| committer | Harald Fernengel <harald.fernengel@nokia.com> | 2011-11-15 16:28:19 (GMT) |
| commit | b721cff590ca7e98f121f483d86bd089787639ff (patch) | |
| tree | ab69a2493697f8dcf159240eb843eb647f14c311 /qmake/generators | |
| parent | fe02f62524515b80edd9b18609fe7e5b1fb7eb2b (diff) | |
| download | Qt-b721cff590ca7e98f121f483d86bd089787639ff.zip Qt-b721cff590ca7e98f121f483d86bd089787639ff.tar.gz Qt-b721cff590ca7e98f121f483d86bd089787639ff.tar.bz2 | |
Use outname to specify the output .gpj to generate.
This resolves several path issues as well.
outname itself is now based on the first TARGET file,
instead of using the output filename.
Merge-request: 1438
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
Diffstat (limited to 'qmake/generators')
| -rw-r--r-- | qmake/generators/integrity/gbuild.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/qmake/generators/integrity/gbuild.cpp b/qmake/generators/integrity/gbuild.cpp index 081b441..4601130 100644 --- a/qmake/generators/integrity/gbuild.cpp +++ b/qmake/generators/integrity/gbuild.cpp @@ -77,7 +77,7 @@ GBuildMakefileGenerator::writeMakefile(QTextStream &text) /* correct output for non-prl, non-recursive case */ QString outname(qmake_getpwd()); outname += QDir::separator(); - outname += fileInfo(Option::output.fileName()).baseName(); + outname += strtarget; outname += projectSuffix(); Option::output.close(); Option::output.setFileName(outname); @@ -148,9 +148,9 @@ GBuildMakefileGenerator::writeMakefile(QTextStream &text) /* change current project file to <projectname>_app.gpj and continue * generation */ - filename.insert(filename.lastIndexOf("."), "_app"); + outname.insert(outname.lastIndexOf("."), "_app"); Option::output.close(); - Option::output.setFileName(filename); + Option::output.setFileName(outname); MakefileGenerator::openOutput(Option::output, QString()); } else if ((project->first("TEMPLATE") == "lib") && project->isActiveConfig("dll")) { |