diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-06-12 18:49:24 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-06-15 09:14:48 (GMT) |
| commit | 98899a4122565090640672d9aae2c37315f186ce (patch) | |
| tree | de82134a9eba978a2090568e0b472c355fd3d621 /projects.pro | |
| parent | b3743d1df735d4b46f45e034818bbfe45bf8d22e (diff) | |
| download | Qt-98899a4122565090640672d9aae2c37315f186ce.zip Qt-98899a4122565090640672d9aae2c37315f186ce.tar.gz Qt-98899a4122565090640672d9aae2c37315f186ce.tar.bz2 | |
fix qm build
so "qmake -r && make" worked fine ... but configure does not simply run
"qmake -r".
also, now we have to build lrelease even when we don't build the other
tools.
Reviewed-by: Jason McDonald
Reviewed-by: mariusSO
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 03ce098..fc53100 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 { |