From 765d1dc555e19c2c71e75e9690ffcb08469043e0 Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Thu, 18 Mar 2010 11:25:07 +1000 Subject: Fixed recursive QMAKE_EXTRA_TARGETS for symbian makefiles. When using recursive QMAKE_EXTRA_TARGETS, qmake will use CHK_DIR_EXISTS and MKDIR when ensuring each subdir has a Makefile created. These previously weren't defined for Symbian. Note that this problem was hidden in most cases, because a `qmake -r' would have created the necessary makefiles already. The problem is revealed when a .pro file does SUBDIRS+=foo.pro and foo.pro is also a subdirs project. Reviewed-by: Michael Goddard --- qmake/generators/symbian/symmake_abld.cpp | 2 ++ qmake/generators/symbian/symmake_sbsv2.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/qmake/generators/symbian/symmake_abld.cpp b/qmake/generators/symbian/symmake_abld.cpp index cd613e0..ad6e743 100644 --- a/qmake/generators/symbian/symmake_abld.cpp +++ b/qmake/generators/symbian/symmake_abld.cpp @@ -204,6 +204,8 @@ void SymbianAbldMakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, bool t << "DEL_FILE = " << var("QMAKE_DEL_FILE") << endl; t << "DEL_DIR = " << var("QMAKE_DEL_DIR") << endl; t << "MOVE = " << var("QMAKE_MOVE") << endl; + t << "CHK_DIR_EXISTS = " << var("QMAKE_CHK_DIR_EXISTS") << endl; + t << "MKDIR = " << var("QMAKE_MKDIR") << endl; t << "XCOPY = xcopy /d /f /h /r /y /i" << endl; t << "ABLD = ABLD.BAT" << endl; t << "DEBUG_PLATFORMS = " << debugPlatforms.join(" ") << endl; diff --git a/qmake/generators/symbian/symmake_sbsv2.cpp b/qmake/generators/symbian/symmake_sbsv2.cpp index 8289f7f..1014ba2 100644 --- a/qmake/generators/symbian/symmake_sbsv2.cpp +++ b/qmake/generators/symbian/symmake_sbsv2.cpp @@ -147,6 +147,8 @@ void SymbianSbsv2MakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, boo t << "QMAKE = " << Option::fixPathToTargetOS(var("QMAKE_QMAKE")) << endl; t << "DEL_FILE = " << var("QMAKE_DEL_FILE") << endl; t << "DEL_DIR = " << var("QMAKE_DEL_DIR") << endl; + t << "CHK_DIR_EXISTS = " << var("QMAKE_CHK_DIR_EXISTS") << endl; + t << "MKDIR = " << var("QMAKE_MKDIR") << endl; t << "MOVE = " << var("QMAKE_MOVE") << endl; t << "DEBUG_PLATFORMS = " << debugPlatforms.join(" ") << endl; t << "RELEASE_PLATFORMS = " << releasePlatforms.join(" ") << endl; -- cgit v0.12