diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2011-01-31 15:13:46 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2011-01-31 15:36:48 (GMT) |
| commit | dc8163d64af88e1daa88c7b1bf9903a87eb3d5b0 (patch) | |
| tree | c73fa3c10ef696fa9509e604e89acf439729eeb6 /mkspecs | |
| parent | e5974b024828578945bd4c349f5f87f82a635225 (diff) | |
| download | Qt-dc8163d64af88e1daa88c7b1bf9903a87eb3d5b0.zip Qt-dc8163d64af88e1daa88c7b1bf9903a87eb3d5b0.tar.gz Qt-dc8163d64af88e1daa88c7b1bf9903a87eb3d5b0.tar.bz2 | |
Make emulator deployment depend on post linking in symbian-sbsv2.
Post linking output was not previously possible to deploy as there
was no dependency from deployment to post linking, which meant
deployment was usually attempted first. Now all post linking in
project tree needs to be done before any deployment is done.
Note that you can still get warnings about missing dependencies as
sbsv2 checks those before it actually executes the targets. These
warnings are harmless, but difficult to get rid of using a general
solution, as qmake cannot make any guesses what QMAKE_POST_LINK
handling might output.
Task-number: QTBUG-17037
Reviewed-by: axis
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm | 8 | ||||
| -rw-r--r-- | mkspecs/symbian-sbsv2/flm/qt/qmake_post_link.flm | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm b/mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm index db91f7f..39ab0f0 100644 --- a/mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm +++ b/mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm @@ -11,6 +11,9 @@ SINGLETON:=$(call sanitise,TARGET_$(DEPLOY_TARGET)) CLEAN_TARGET:= +# Deployment dependencies collection target for post link operations +all_qmake_emulator_deployment_dependencies:: + define qmake_emulator_deployment $(ALLTARGET):: $(1) @@ -19,7 +22,7 @@ $(SINGLETON):=1 CLEAN_TARGET:=$(1) -$(1): $(2) +$(1): $(2) all_qmake_emulator_deployment_dependencies $(call startrule,qmake_emulator_deployment) \ $(GNUCP) --remove-destination --no-preserve=mode $(2) "$$@" && \ $(GNUCHMOD) a+rw "$$@" \ @@ -32,6 +35,3 @@ $(call makepath,$(dir $(DEPLOY_TARGET))) $(eval $(call GenerateStandardCleanTarget,$(CLEAN_TARGET),'')) endif - - - diff --git a/mkspecs/symbian-sbsv2/flm/qt/qmake_post_link.flm b/mkspecs/symbian-sbsv2/flm/qt/qmake_post_link.flm index ae53741..0312d14 100644 --- a/mkspecs/symbian-sbsv2/flm/qt/qmake_post_link.flm +++ b/mkspecs/symbian-sbsv2/flm/qt/qmake_post_link.flm @@ -18,6 +18,8 @@ define command_fixer THE_COMMAND:=$(POST_LINK_CMD) endef +all_qmake_emulator_deployment_dependencies:: $(POST_LINK_TARGET) + define qmake_post_link $(ALLTARGET):: $(POST_LINK_TARGET) |