diff options
| author | Rolland Dudemaine <rolland@ghs.com> | 2011-11-15 16:28:23 (GMT) |
|---|---|---|
| committer | Harald Fernengel <harald.fernengel@nokia.com> | 2011-11-15 16:28:23 (GMT) |
| commit | 0f808217dc6d1dbdfd1beeef4fecc24128eaac7b (patch) | |
| tree | 5f86e953e7935c5f3d54c2fe32a19495572061dd | |
| parent | 0648decd6a5307be3ebf98ea891385989fecb1eb (diff) | |
| download | Qt-0f808217dc6d1dbdfd1beeef4fecc24128eaac7b.zip Qt-0f808217dc6d1dbdfd1beeef4fecc24128eaac7b.tar.gz Qt-0f808217dc6d1dbdfd1beeef4fecc24128eaac7b.tar.bz2 | |
Add support for .pro-type subdirectories.
Merge-request: 1438
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| -rw-r--r-- | qmake/generators/integrity/gbuild.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/integrity/gbuild.cpp b/qmake/generators/integrity/gbuild.cpp index 9b75fbc..dd20321 100644 --- a/qmake/generators/integrity/gbuild.cpp +++ b/qmake/generators/integrity/gbuild.cpp @@ -83,7 +83,7 @@ GBuildMakefileGenerator::writeMakefile(QTextStream &text) Option::output.setFileName(outname); MakefileGenerator::openOutput(Option::output, QString()); - if (strtarget != fileInfo(project->projectFile()).baseName()) { + if (strtarget != fileInfo(project->projectFile()).baseName().section('.', -2, -2)) { QString gpjname(strtarget); QString outputName(qmake_getpwd()); outputName += QDir::separator(); |