From a5fa6f3e2a7376428f5508336a8678723cbc3e94 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Mon, 12 Apr 2010 11:10:56 +0200
Subject: make the code less of a trap

it's not very wise to use += first, and then to overwrite everything
with =. use proper scoping instead.

Reviewed-by: joerg
---
 tools/tools.pro | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/tools/tools.pro b/tools/tools.pro
index 47ad0d7..c512e11 100644
--- a/tools/tools.pro
+++ b/tools/tools.pro
@@ -4,21 +4,25 @@ TEMPLATE        = subdirs
     no-png {
         message("Some graphics-related tools are unavailable without PNG support")
     } else {
-         SUBDIRS += assistant \
-		    pixeltool \
-		    porting \
-                    qtestlib \
-                    qttracereplay
-         contains(QT_EDITION, Console) {
-             SUBDIRS += designer/src/uitools     # Linguist depends on this
-         } else {
-             SUBDIRS += designer
-         }
-	 SUBDIRS     += linguist
-         symbian: SUBDIRS = designer
-         wince*: SUBDIRS = qtestlib designer
-         unix:!mac:!embedded:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig
-         win32:!wince*:SUBDIRS += activeqt
+        symbian {
+            SUBDIRS = designer
+        } else:wince* {
+            SUBDIRS = qtestlib designer
+        } else {
+            SUBDIRS = assistant \
+                      linguist \
+                      pixeltool \
+                      porting \
+                      qtestlib \
+                      qttracereplay
+            contains(QT_EDITION, Console) {
+                SUBDIRS += designer/src/uitools     # Linguist depends on this
+            } else {
+                SUBDIRS += designer
+            }
+        }
+        unix:!mac:!embedded:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig
+        win32:!wince*:SUBDIRS += activeqt
     }
     contains(QT_CONFIG, declarative):SUBDIRS += qml
 }
-- 
cgit v0.12