diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-09-06 10:36:09 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-09-06 13:08:20 (GMT) |
| commit | d3064666be3909583ccdb873672011d1db4588e4 (patch) | |
| tree | dc42e967f236f1b0aeec3e380662d704abea8fe6 /mkspecs | |
| parent | f4bada8cbba5f209556ad4e3703d412e4146a0af (diff) | |
| download | Qt-d3064666be3909583ccdb873672011d1db4588e4.zip Qt-d3064666be3909583ccdb873672011d1db4588e4.tar.gz Qt-d3064666be3909583ccdb873672011d1db4588e4.tar.bz2 | |
Fixes for QMAKE_EXTRA_* variable handling in symbian-sbsv2
- No longer require PRE_TARGETDEPS items to be absolute, which was
difficult to achieve sometimes as qmake doesn't provide method
for absolutizing paths.
- Do smart command replacement for commands containing $$QMAKE_*
command variables, such as $$QMAKE_COPY, when generating bld.inf
extensions for QMAKE_EXTRA_* variables.
$$QMAKE_* command variables cannot be passed to sbsv2 toolchain
directly, as it uses cygwin in windows, and they can't simply
be replaced to use sbsv2 equivalents in symbian.conf, because
generated wrapper makefiles need them to be Windows compatible.
Reviewed-by: axis
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/symbian/symbian-mmp.conf | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/mkspecs/common/symbian/symbian-mmp.conf b/mkspecs/common/symbian/symbian-mmp.conf index 4230ad7..5292781 100644 --- a/mkspecs/common/symbian/symbian-mmp.conf +++ b/mkspecs/common/symbian/symbian-mmp.conf @@ -55,3 +55,15 @@ symbian { } } } + +# Variables for replacing equivalent QMAKE_* variables in bld.inf for FLM execution of commands +symbian-sbsv2 { + QMAKE_SBSV2_COPY = $(GNUCP) + QMAKE_SBSV2_COPY_DIR = $(GNUCP) -r + QMAKE_SBSV2_MOVE = $(GNUMV) + QMAKE_SBSV2_DEL_FILE = $(GNURM) -f + QMAKE_SBSV2_MKDIR = $(GNUMKDIR) + QMAKE_SBSV2_DEL_DIR = $(GNURMDIR) + QMAKE_SBSV2_DEL_TREE = $(GNURM) -rf +} + |