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