From 0d5e9562ebb8392ccb2dc2bc67098e8d8852252f Mon Sep 17 00:00:00 2001
From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Tue, 16 Jun 2009 20:44:22 +1000
Subject: Revert "fix qm build"

This reverts commit e75ef82bc4570c0a6da3da26a1dda5d6e065f23b.
---
 configure                        | 4 ----
 projects.pro                     | 8 +-------
 tools/configure/configureapp.cpp | 1 -
 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/configure b/configure
index 5a162ee..ece117b 100755
--- a/configure
+++ b/configure
@@ -7050,9 +7050,6 @@ FNR == 1 {
     if ( \$3 == "moc" || \$3 ~ /^Qt/ ) {
         target_file = first
         matched_target = 1
-    } else if ( \$3 == "lrelease" || \$3 == "qm_phony_target" ) {
-        target_file = second
-        matched_target = 1
     }
 }
 
@@ -7137,7 +7134,6 @@ for part in $CFG_BUILD_PARTS; do
     case "$part" in
     tools) PART_ROOTS="$PART_ROOTS tools" ;;
     libs) PART_ROOTS="$PART_ROOTS src" ;;
-    translations) PART_ROOTS="$PART_ROOTS tools/linguist/lrelease translations" ;;
     examples) PART_ROOTS="$PART_ROOTS examples demos" ;;
     *) ;;
     esac
diff --git a/projects.pro b/projects.pro
index fc53100..03ce098 100644
--- a/projects.pro
+++ b/projects.pro
@@ -10,10 +10,6 @@ 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
@@ -43,10 +39,8 @@ for(PROJECT, $$list($$lower($$unique(QT_BUILD_PARTS)))) {
     } 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
        }
-       SUBDIRS += translations                    # qm build step
     } else:isEqual(PROJECT, qmake) {
 #      SUBDIRS += qmake
     } else {
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 128e578..60d86b8 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -3142,7 +3142,6 @@ void Configure::buildHostTools()
         << "src/tools/moc"
         << "src/tools/rcc"
         << "src/tools/uic"
-        << "tools/linguist/lrelease"
         << "tools/checksdk";
 
     if (dictionary[ "CETEST" ] == "yes")
-- 
cgit v0.12