diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-03-18 01:25:07 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-03-18 03:04:58 (GMT) |
| commit | 765d1dc555e19c2c71e75e9690ffcb08469043e0 (patch) | |
| tree | 6e3c1c5eb21ab591e72d9443d4a55c186dd01aa6 /qmake | |
| parent | 4bec9a7dcb89e18b54a7bc3f5230b5a98611fd06 (diff) | |
| download | Qt-765d1dc555e19c2c71e75e9690ffcb08469043e0.zip Qt-765d1dc555e19c2c71e75e9690ffcb08469043e0.tar.gz Qt-765d1dc555e19c2c71e75e9690ffcb08469043e0.tar.bz2 | |
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
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/symbian/symmake_abld.cpp | 2 | ||||
| -rw-r--r-- | qmake/generators/symbian/symmake_sbsv2.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
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; |