diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-07-01 14:23:00 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-07-01 15:42:05 (GMT) |
| commit | 71547238ea4391636e37f5cf89905433faeb32d1 (patch) | |
| tree | 78c85b9ec50e7f7275f75bc2a6ebf9afec2d67eb /mkspecs | |
| parent | 80c2fbd7bb49483daf0a038a5e2ff85472a88ad2 (diff) | |
| download | Qt-71547238ea4391636e37f5cf89905433faeb32d1.zip Qt-71547238ea4391636e37f5cf89905433faeb32d1.tar.gz Qt-71547238ea4391636e37f5cf89905433faeb32d1.tar.bz2 | |
Symbian on Linux: $QTDIR/bin is not necessarily in the path.
So it would not find elf2e32_qtwrapper
use the qtPrepareTool macro that does the right thing.
But this macro need QT_BUILD_TREE to be defined, which is not defined
yet early in the test process. So change the tests accordingly
Reviewed-by: ossi
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/symbian/symbian_building.prf | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mkspecs/features/symbian/symbian_building.prf b/mkspecs/features/symbian/symbian_building.prf index fbaefca..c4088ca 100644 --- a/mkspecs/features/symbian/symbian_building.prf +++ b/mkspecs/features/symbian/symbian_building.prf @@ -8,6 +8,8 @@ QMAKE_LFLAGS += -Ttext 0x80000 -Tdata 0x400000 } +qtPrepareTool(QMAKE_ELF2E32_WRAPPER, elf2e32_qtwrapper) + isEmpty(TARGET.EPOCSTACKSIZE):TARGET.EPOCSTACKSIZE = 0x14000 isEmpty(TARGET.EPOCHEAPSIZE):TARGET.EPOCHEAPSIZE = 0x020000 0x800000 epoc_heap_size = $$split(TARGET.EPOCHEAPSIZE, " ") @@ -107,7 +109,7 @@ contains(TEMPLATE, lib):!contains(CONFIG, static):!contains(CONFIG, staticlib) { contains(CONFIG, plugin):QMAKE_ELF2E32_FLAGS += --definput=plugin_commonu.def QMAKE_POST_LINK = $$QMAKE_MOVE $$symbianDestdir/$${baseTarget}.dll $$symbianDestdir/$${baseTarget}.sym \ - && elf2e32_qtwrapper --version=$$decVersion \ + && $$QMAKE_ELF2E32_WRAPPER --version=$$decVersion \ --sid=$$TARGET.SID \ --uid1=0x10000079 \ --uid2=$$TARGET.UID2 \ @@ -155,7 +157,7 @@ contains(TEMPLATE, app):!contains(QMAKE_LINK, "^@.*") { QMAKE_POST_LINK = && $$QMAKE_POST_LINK } QMAKE_POST_LINK = $$QMAKE_MOVE $$symbianDestdir/$${baseTarget} $$symbianDestdir/$${baseTarget}.sym \ - && elf2e32_qtwrapper --version $$decVersion \ + && $$QMAKE_ELF2E32_WRAPPER --version $$decVersion \ --sid=$$TARGET.SID \ --uid1=0x1000007a \ --uid2=$$TARGET.UID2 \ |