From 98899a4122565090640672d9aae2c37315f186ce Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Fri, 12 Jun 2009 20:49:24 +0200
Subject: 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
---
 projects.pro | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'projects.pro')

diff --git a/projects.pro b/projects.pro
index 03ce0984e3..fc531009db 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 {
-- 
cgit v1.2.3


From f2f9babce5d7910f76aa47f5c446ccd0f9f23ac1 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Tue, 16 Jun 2009 17:29:22 +0200
Subject: 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
---
 projects.pro | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'projects.pro')

diff --git a/projects.pro b/projects.pro
index fc531009db..f6c596d8a9 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 {
-- 
cgit v1.2.3