From ad2930f82536c9f5d38b644c5a070ce1248f6ee2 Mon Sep 17 00:00:00 2001
From: Xizhi Zhu <xizhi.zhu@gmail.com>
Date: Mon, 23 Jan 2012 18:33:22 +0100
Subject: Remove Symbian code from tools.

Change-Id: Id9d7b2b4f6bc8b558f92bc09b7956c49e5a3752a
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
---
 src/tools/tools.pro | 68 ++++++++++++++++++++++++++---------------------------
 1 file changed, 33 insertions(+), 35 deletions(-)

(limited to 'src/tools/tools.pro')

diff --git a/src/tools/tools.pro b/src/tools/tools.pro
index 5cbe92309e..e6b9eefc69 100644
--- a/src/tools/tools.pro
+++ b/src/tools/tools.pro
@@ -22,41 +22,39 @@ src_tools_uic.target = sub-uic
 # Special handling, depending on type of project, if it used debug/release or only has one configuration
 EXTRA_DEBUG_TARGETS =
 EXTRA_RELEASE_TARGETS =
-!symbian {
-    for(subname, TOOLS_SUBDIRS) {
-        subdir = $$subname
-        !isEmpty($${subname}.subdir):subdir = $$eval($${subname}.subdir)
-        subpro = $$subdir/$${basename(subdir)}.pro
-        !exists($$subpro):next()
-        subtarget = $$replace(subdir, [^A-Za-z0-9], _)
-        reg_src = $$replace(QT_SOURCE_TREE, \\\\, \\\\)
-        subdir = $$replace(subdir, $$reg_src, $$QT_BUILD_TREE)
-        subdir = $$replace(subdir, /, $$QMAKE_DIR_SEP)
-        subdir = $$replace(subdir, \\\\, $$QMAKE_DIR_SEP)
-        SUB_TEMPLATE = $$list($$fromfile($$subpro, TEMPLATE))
-        !isEqual(subname, src_tools_bootstrap):if(isEqual($$SUB_TEMPLATE, lib) | isEqual($$SUB_TEMPLATE, subdirs)):!separate_debug_info {
-            #debug
-            debug-$${subtarget}.depends = $${subdir}$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_DEBUG_TARGETS
-            debug-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) debug)
-            EXTRA_DEBUG_TARGETS += debug-$${subtarget}
-            QMAKE_EXTRA_TARGETS += debug-$${subtarget}
-            #release
-            release-$${subtarget}.depends = $${subdir}$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_RELEASE_TARGETS
-            release-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) release)
-            EXTRA_RELEASE_TARGETS += release-$${subtarget}
-            QMAKE_EXTRA_TARGETS += release-$${subtarget}
-        } else { #do not have a real debug target/release
-            #debug
-            debug-$${subtarget}.depends = $${subdir}$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_DEBUG_TARGETS
-            debug-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) first)
-            EXTRA_DEBUG_TARGETS += debug-$${subtarget}
-            QMAKE_EXTRA_TARGETS += debug-$${subtarget}
-            #release
-            release-$${subtarget}.depends = $${subdir}$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_RELEASE_TARGETS
-            release-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) first)
-            EXTRA_RELEASE_TARGETS += release-$${subtarget}
-            QMAKE_EXTRA_TARGETS += release-$${subtarget}
-        }
+for(subname, TOOLS_SUBDIRS) {
+    subdir = $$subname
+    !isEmpty($${subname}.subdir):subdir = $$eval($${subname}.subdir)
+    subpro = $$subdir/$${basename(subdir)}.pro
+    !exists($$subpro):next()
+    subtarget = $$replace(subdir, [^A-Za-z0-9], _)
+    reg_src = $$replace(QT_SOURCE_TREE, \\\\, \\\\)
+    subdir = $$replace(subdir, $$reg_src, $$QT_BUILD_TREE)
+    subdir = $$replace(subdir, /, $$QMAKE_DIR_SEP)
+    subdir = $$replace(subdir, \\\\, $$QMAKE_DIR_SEP)
+    SUB_TEMPLATE = $$list($$fromfile($$subpro, TEMPLATE))
+    !isEqual(subname, src_tools_bootstrap):if(isEqual($$SUB_TEMPLATE, lib) | isEqual($$SUB_TEMPLATE, subdirs)):!separate_debug_info {
+        #debug
+        debug-$${subtarget}.depends = $${subdir}$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_DEBUG_TARGETS
+        debug-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) debug)
+        EXTRA_DEBUG_TARGETS += debug-$${subtarget}
+        QMAKE_EXTRA_TARGETS += debug-$${subtarget}
+        #release
+        release-$${subtarget}.depends = $${subdir}$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_RELEASE_TARGETS
+        release-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) release)
+        EXTRA_RELEASE_TARGETS += release-$${subtarget}
+        QMAKE_EXTRA_TARGETS += release-$${subtarget}
+    } else { #do not have a real debug target/release
+        #debug
+        debug-$${subtarget}.depends = $${subdir}$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_DEBUG_TARGETS
+        debug-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) first)
+        EXTRA_DEBUG_TARGETS += debug-$${subtarget}
+        QMAKE_EXTRA_TARGETS += debug-$${subtarget}
+        #release
+        release-$${subtarget}.depends = $${subdir}$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_RELEASE_TARGETS
+        release-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) first)
+        EXTRA_RELEASE_TARGETS += release-$${subtarget}
+        QMAKE_EXTRA_TARGETS += release-$${subtarget}
     }
 }
 
-- 
cgit v1.2.3