summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJanne Anttila <janne.anttila@digia.com>2009-08-27 07:20:21 (GMT)
committerJanne Anttila <janne.anttila@digia.com>2009-08-27 07:20:21 (GMT)
commit8c4c7cc111331256b2637e067298e1c93b2e8c3c (patch)
treecd7cba3880f47684f47036be55f5397d54031bf3
parent7f08c316c4accf21c37ba75b299ca3504cb1a2ec (diff)
downloadQt-8c4c7cc111331256b2637e067298e1c93b2e8c3c.zip
Qt-8c4c7cc111331256b2637e067298e1c93b2e8c3c.tar.gz
Qt-8c4c7cc111331256b2637e067298e1c93b2e8c3c.tar.bz2
Bug fix for store_build target when using subdirs project template.
.make.cache need to be generated also for subdirs, this commit fixes this bug in previous commit related to 'make sisx' target.
-rw-r--r--qmake/generators/symbian/symmake_abld.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/qmake/generators/symbian/symmake_abld.cpp b/qmake/generators/symbian/symmake_abld.cpp
index d66557a..975a20f 100644
--- a/qmake/generators/symbian/symmake_abld.cpp
+++ b/qmake/generators/symbian/symmake_abld.cpp
@@ -102,12 +102,14 @@ void SymbianAbldMakefileGenerator::writeMkFile(const QString& wrapperFileName, b
QString finalDepsWinscw;
QStringList wrapperTargets;
if (deploymentOnly) {
- buildDeps.append(DO_NOTHING_TARGET);
+ buildDeps.append(STORE_BUILD_TARGET);
cleanDeps.append(DO_NOTHING_TARGET);
cleanDepsWinscw.append(WINSCW_DEPLOYMENT_CLEAN_TARGET);
finalDeps.append(DO_NOTHING_TARGET);
finalDepsWinscw.append(WINSCW_DEPLOYMENT_TARGET);
- wrapperTargets << WINSCW_DEPLOYMENT_TARGET << WINSCW_DEPLOYMENT_CLEAN_TARGET;
+ wrapperTargets << WINSCW_DEPLOYMENT_TARGET
+ << WINSCW_DEPLOYMENT_CLEAN_TARGET
+ << STORE_BUILD_TARGET;
} else {
buildDeps.append(CREATE_TEMPS_TARGET " " PRE_TARGETDEPS_TARGET " " STORE_BUILD_TARGET);
cleanDeps.append(EXTENSION_CLEAN);