Fixed recursive QMAKE_EXTRA_TARGETS not being generated correctly for

SUBDIRS projects when using sbsv2.

Acked-by: Miikka Heikkinen

1 files changed, 10 insertions, 2 deletions

diff --git a/qmake/generators/symbian/symmake_sbsv2.cpp b/qmake/generators/symbian/symmake_sbsv2.cpp
index 33431d2..7b739c7 100644
--- a/qmake/generators/symbian/symmake_sbsv2.cpp
+++ b/qmake/generators/symbian/symmake_sbsv2.cpp
@@ -124,6 +124,10 @@ void SymbianSbsv2MakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, boo
     t << "#" << endl;
     t << "# ==============================================================================" << "\n" << endl;
     t << endl;
+    QString ofile = Option::fixPathToTargetOS(Option::output.fileName());
+    if(ofile.lastIndexOf(Option::dir_sep) != -1)
+        ofile = ofile.right(ofile.length() - ofile.lastIndexOf(Option::dir_sep) -1);
+    t << "MAKEFILE          = " << ofile << endl;
     t << "QMAKE             = " << Option::fixPathToTargetOS(var("QMAKE_QMAKE")) << endl;
     t << "DEL_FILE          = " << var("QMAKE_DEL_FILE") << endl;
     t << "DEL_DIR           = " << var("QMAKE_DEL_DIR") << endl;
@@ -206,11 +210,15 @@ void SymbianSbsv2MakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, boo
     // Add all extra targets including extra compiler targest also to wrapper makefile,
     // even though many of them may have already been added to bld.inf as FLMs.
     // This is to enable use of targets like 'mocables', which call targets generated by extra compilers.
-    t << extraTargetsCache;
-
     if (!isSubdirs) {
+        t << extraTargetsCache;
         t << extraCompilersCache;
     }
+    else {
+        QList<MakefileGenerator::SubTarget*> subtargets = findSubDirsSubTargets();
+        writeSubTargets(t, subtargets, SubTargetSkipDefaultVariables|SubTargetSkipDefaultTargets);
+        qDeleteAll(subtargets);
+    }
 
     t << "dodistclean:" << endl;
     foreach(QString item, project->values("SUBDIRS")) {