From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Mon, 17 Oct 2011 17:44:08 +0000 (+0200)
Subject: de-obfuscate code
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=58cc0c5a5cad2b7e840cea35d0b85d6e26c3d3b2;p=qt-creator-jp%2Fqt-creator-jp.git

de-obfuscate code

remove pointless condition and join identical branches.

Change-Id: Iefe86e580d485cba1a71e2a379781b342d8c75d8
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
---

diff --git a/qtcreator.pri b/qtcreator.pri
index e4b262fd16..a5fc6fce29 100644
--- a/qtcreator.pri
+++ b/qtcreator.pri
@@ -107,12 +107,8 @@ macx {
         QMAKE_LFLAGS *= -mmacosx-version-min=10.5
     }
 } else {
-    win32 {
-        contains(TEMPLATE, vc.*)|contains(TEMPLATE_PREFIX, vc):vcproj = 1
-        IDE_APP_TARGET   = qtcreator
-    } else {
-        IDE_APP_TARGET   = qtcreator
-    }
+    contains(TEMPLATE, vc.*):vcproj = 1
+    IDE_APP_TARGET   = qtcreator
     IDE_LIBRARY_PATH = $$IDE_BUILD_TREE/$$IDE_LIBRARY_BASENAME/qtcreator
     IDE_PLUGIN_PATH  = $$IDE_LIBRARY_PATH/plugins
     IDE_LIBEXEC_PATH = $$IDE_APP_PATH # FIXME