From 4ac264117a178dc2fbee11aca4b58bc4073e737b Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 14 Sep 2012 12:28:06 +0200 Subject: 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 --- mkspecs/features/incredibuild_xge.prf | 5 +---- mkspecs/features/moc.prf | 4 +--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/mkspecs/features/incredibuild_xge.prf b/mkspecs/features/incredibuild_xge.prf index 028f39d7b6..b43ecf2809 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: - # 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 cf19c6596c..250f57a265 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: - # 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) -- cgit v1.2.3