diff options
| author | Thomas Zander <t.zander@nokia.com> | 2010-02-04 14:11:21 (GMT) |
|---|---|---|
| committer | Thomas Zander <t.zander@nokia.com> | 2010-02-04 15:22:31 (GMT) |
| commit | b8705c3dd756243503fd1e469f6ac4907222b321 (patch) | |
| tree | 22394a6d9743822bb446a20ca218de68daed4dd6 | |
| parent | 0a44fd45d97fa5286eefdf1c2cb77a3b8585ff29 (diff) | |
| download | Qt-b8705c3dd756243503fd1e469f6ac4907222b321.zip Qt-b8705c3dd756243503fd1e469f6ac4907222b321.tar.gz Qt-b8705c3dd756243503fd1e469f6ac4907222b321.tar.bz2 | |
Re-anable building of lrelease and fix the translations dir to 'compile'
If we want translations to work, we need lrelease, so that should not
be disabled anymore for symbian.
Work around the hack of translations/translations.pro to not link anything
so we don't do post-linking on symbian (which failed).
| -rw-r--r-- | mkspecs/symbian/linux-armcc/features/symbian_building.prf | 2 | ||||
| -rw-r--r-- | projects.pro | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/symbian/linux-armcc/features/symbian_building.prf b/mkspecs/symbian/linux-armcc/features/symbian_building.prf index da15872..db215cf 100644 --- a/mkspecs/symbian/linux-armcc/features/symbian_building.prf +++ b/mkspecs/symbian/linux-armcc/features/symbian_building.prf @@ -93,7 +93,7 @@ contains(TEMPLATE, lib):!contains(CONFIG, static):!contains(CONFIG, staticlib) { QMAKE_LFLAGS += --symver_soname --soname $${TARGET}\\{$${hexVersion}\\}\\[$${intUid3}\\].dll } -contains(TEMPLATE, app) { +contains(TEMPLATE, app):!contains(QMAKE_LINK, "^@.*") { !isEmpty($$QMAKE_POST_LINK):QMAKE_POST_LINK += && QMAKE_POST_LINK += $$QMAKE_MOVE $$symbianDestdir/$${TARGET} $$symbianDestdir/$${TARGET}.sym diff --git a/projects.pro b/projects.pro index d405a5b..d98a24f 100644 --- a/projects.pro +++ b/projects.pro @@ -48,7 +48,7 @@ for(PROJECT, $$list($$lower($$unique(QT_BUILD_PARTS)))) { contains(QT_BUILD_PARTS, tools) { include(translations/translations.pri) # ts targets } else { - !wince*:!symbian:SUBDIRS += tools/linguist/lrelease + !wince*:SUBDIRS += tools/linguist/lrelease } SUBDIRS += translations # qm build step } else:isEqual(PROJECT, qmake) { |