From 0f808217dc6d1dbdfd1beeef4fecc24128eaac7b Mon Sep 17 00:00:00 2001
From: Rolland Dudemaine <rolland@ghs.com>
Date: Tue, 15 Nov 2011 17:28:23 +0100
Subject: Add support for .pro-type subdirectories.

Merge-request: 1438
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
---
 qmake/generators/integrity/gbuild.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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();
-- 
cgit v0.12