diff options
| author | Volker Hilsheimer <volker.hilsheimer@nokia.com> | 2009-06-16 17:15:48 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@nokia.com> | 2009-06-16 17:15:48 +0200 |
| commit | e73e36a16bb51fa66bdccc780f177e2c4d5d8092 (patch) | |
| tree | 12b6de8d0cb5c630a05f28686d4baabe474dbfda /projects.pro | |
| parent | 237a3e690f290fd8ef8ef2a51459caa7fdc7bef1 (diff) | |
| parent | d4ea3957a535ac522bd29b0645e614e0ccd09f82 (diff) | |
Merge license header changes from 4.5
Diffstat (limited to 'projects.pro')
| -rw-r--r-- | projects.pro | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/projects.pro b/projects.pro index 68608a288c..2d8e7f406a 100644 --- a/projects.pro +++ b/projects.pro @@ -10,6 +10,10 @@ cross_compile: CONFIG += nostrip isEmpty(QT_BUILD_PARTS) { #defaults QT_BUILD_PARTS = libs tools examples demos docs translations } else { #make sure the order makes sense + contains(QT_BUILD_PARTS, translations) { + QT_BUILD_PARTS -= translations + QT_BUILD_PARTS = translations $$QT_BUILD_PARTS + } contains(QT_BUILD_PARTS, tools) { QT_BUILD_PARTS -= tools QT_BUILD_PARTS = tools $$QT_BUILD_PARTS @@ -39,8 +43,10 @@ for(PROJECT, $$list($$lower($$unique(QT_BUILD_PARTS)))) { } else:isEqual(PROJECT, translations) { contains(QT_BUILD_PARTS, tools) { include(translations/translations.pri) # ts targets - SUBDIRS += translations # qm build step + } else { + SUBDIRS += tools/linguist/lrelease } + SUBDIRS += translations # qm build step } else:isEqual(PROJECT, qmake) { # SUBDIRS += qmake } else { |