From f96470898c11ac2dfc0111925cc1843348e72f19 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@nokia.com>
Date: Mon, 12 Apr 2010 09:43:57 +0200
Subject: Partially revert MR 543 changes to Linguist.

Whatever this is doing, it breaks the build on Windows CE/Mobile. This
has stopped oslo-staging-1 from integrating for over a week now.

Not reviewed. This patch is a blind attempt at fixing the issue.
---
 tools/linguist/linguist.pro | 2 +-
 tools/tools.pro             | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/tools/linguist/linguist.pro b/tools/linguist/linguist.pro
index 248c89e..85ecd5a 100644
--- a/tools/linguist/linguist.pro
+++ b/tools/linguist/linguist.pro
@@ -1,6 +1,6 @@
 TEMPLATE = subdirs
 SUBDIRS  = \
+    linguist \
     lrelease \
     lupdate \
     lconvert
-!no-png:!contains(QT_CONFIG, no-gui):SUBDIRS += linguist
diff --git a/tools/tools.pro b/tools/tools.pro
index 99a965d..47ad0d7 100644
--- a/tools/tools.pro
+++ b/tools/tools.pro
@@ -14,6 +14,7 @@ TEMPLATE        = subdirs
          } else {
              SUBDIRS += designer
          }
+	 SUBDIRS     += linguist
          symbian: SUBDIRS = designer
          wince*: SUBDIRS = qtestlib designer
          unix:!mac:!embedded:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig
@@ -22,8 +23,6 @@ TEMPLATE        = subdirs
     contains(QT_CONFIG, declarative):SUBDIRS += qml
 }
 
-SUBDIRS     += linguist
-
 mac {
     SUBDIRS += macdeployqt
 }
-- 
cgit v0.12