summaryrefslogtreecommitdiffstats
path: root/projects.pro
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2009-06-16 15:29:22 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2009-06-16 15:55:51 (GMT)
commitf2f9babce5d7910f76aa47f5c446ccd0f9f23ac1 (patch)
tree33fa27891cf5c0555c150b8d4bc5923dd639da6a /projects.pro
parent4645c7861804b3e22333ba29244b6ee4a60175b2 (diff)
downloadQt-f2f9babce5d7910f76aa47f5c446ccd0f9f23ac1.zip
Qt-f2f9babce5d7910f76aa47f5c446ccd0f9f23ac1.tar.gz
Qt-f2f9babce5d7910f76aa47f5c446ccd0f9f23ac1.tar.bz2
revert built-time qm generation
it simply breaks too much (embedded builds in particular). will come up with something better in master. note however, that the .qm files do NOT return to the repository. the release manager needs to run "make qm" before packaging, just like Qt-from-git users who want translations do (i.e., almost nobody). Reviewed-by: Jason McDonald
Diffstat (limited to 'projects.pro')
-rw-r--r--projects.pro7
1 files changed, 1 insertions, 6 deletions
diff --git a/projects.pro b/projects.pro
index fc53100..f6c596d 100644
--- a/projects.pro
+++ b/projects.pro
@@ -41,12 +41,7 @@ for(PROJECT, $$list($$lower($$unique(QT_BUILD_PARTS)))) {
} else:isEqual(PROJECT, docs) {
contains(QT_BUILD_PARTS, tools):include(doc/doc.pri)
} else:isEqual(PROJECT, translations) {
- contains(QT_BUILD_PARTS, tools) {
- include(translations/translations.pri) # ts targets
- } else {
- SUBDIRS += tools/linguist/lrelease
- }
- SUBDIRS += translations # qm build step
+ contains(QT_BUILD_PARTS, tools):include(translations/translations.pri)
} else:isEqual(PROJECT, qmake) {
# SUBDIRS += qmake
} else {