From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Fri, 14 Sep 2012 10:28:06 +0000 (+0200)
Subject: remove pointless conditionals+branches
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4ac264117a178dc2fbee11aca4b58bc4073e737b;p=profile%2Fivi%2Fqtbase.git

remove pointless conditionals+branches

the surrounding TEMPLATE == vc* scope already implies vcproj, as dsp is
not supported any more.

Change-Id: I68363aca62e21135f42572040ccc7b189dcf32c8
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
---

diff --git a/mkspecs/features/incredibuild_xge.prf b/mkspecs/features/incredibuild_xge.prf
index 028f39d..b43ecf2 100644
--- a/mkspecs/features/incredibuild_xge.prf
+++ b/mkspecs/features/incredibuild_xge.prf
@@ -1,9 +1,6 @@
 contains(TEMPLATE, "vc.*") {
-    EOC = $$escape_expand(\\n\\t)
-
     # The VCPROJ generator will replace the \r\h with the coded \r\n: &#x0d;&#x0a;
-    # No other generator understands the \h
-    win32-msvc2*|wince*msvc*: EOC = $$escape_expand(\\r\\h)
+    EOC = $$escape_expand(\\r\\h)
 
     for(xge, INCREDIBUILD_XGE) {
         $${xge}.commands = Rem IncrediBuild_AllowRemote $$EOC Rem IncrediBuild_OutputFile $$shell_path($${xge}.output) $$EOC $$eval($${xge}.commands)
diff --git a/mkspecs/features/moc.prf b/mkspecs/features/moc.prf
index cf19c65..250f57a 100644
--- a/mkspecs/features/moc.prf
+++ b/mkspecs/features/moc.prf
@@ -18,9 +18,7 @@ win32:count($$list($$INCLUDEPATH), 40, >) {
 
     contains(TEMPLATE, "vc.*") {
         # the VCPROJ generator will replace the \r\h with the coded \r\n: &#x0d;&#x0a;
-        # No other generator understands the \h
-        if(win32-msvc2*|wince*msvc*): EOC = $$escape_expand(\\r\\h)
-        else: EOC = $$escape_expand(\\\\\\n\\t)
+        EOC = $$escape_expand(\\r\\h)
     }
 
     unset(INCFILELIST)