From 9aa6c4a1647c3d68563b6a763f7c27e5deda7601 Mon Sep 17 00:00:00 2001
From: Yuchen Deng <loaden@gmail.com>
Date: Sun, 17 Feb 2013 10:58:43 +0800
Subject: [PATCH] CMake: Does not need m_buildTargetType anymore

Change-Id: I45f927391d73258f8f61eebe8543b6f5052678ec
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
---
 src/plugins/cmakeprojectmanager/cmakeproject.cpp | 14 ++++----------
 src/plugins/cmakeprojectmanager/cmakeproject.h   |  1 -
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
index eb5824a98d4..03f226892d9 100644
--- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
@@ -1093,7 +1093,6 @@ void CMakeCbpParser::parseBuild()
 
 void CMakeCbpParser::parseBuildTarget()
 {
-    m_buildTargetType = false;
     m_buildTarget.clear();
 
     if (attributes().hasAttribute(QLatin1String("title")))
@@ -1119,15 +1118,10 @@ void CMakeCbpParser::parseBuildTargetOption()
 {
     if (attributes().hasAttribute(QLatin1String("output"))) {
         m_buildTarget.executable = attributes().value(QLatin1String("output")).toString();
-    } else if (attributes().hasAttribute(QLatin1String("type"))
-               && (attributes().value(QLatin1String("type")) == QLatin1String("1")
-                   || attributes().value(QLatin1String("type")) == QLatin1String("0"))) {
-        m_buildTargetType = true;
-    } else if (attributes().hasAttribute(QLatin1String("type"))
-               && (attributes().value(QLatin1String("type")) == QLatin1String("3")
-                   || attributes().value(QLatin1String("type")) == QLatin1String("2"))) {
-        m_buildTargetType = true;
-        m_buildTarget.library = true;
+    } else if (attributes().hasAttribute(QLatin1String("type"))) {
+        const QString value = attributes().value(QLatin1String("type")).toString();
+        if (value == QLatin1String("2") || value == QLatin1String("3"))
+            m_buildTarget.library = true;
     } else if (attributes().hasAttribute(QLatin1String("working_dir"))) {
         m_buildTarget.workingDirectory = attributes().value(QLatin1String("working_dir")).toString();
     }
diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.h b/src/plugins/cmakeprojectmanager/cmakeproject.h
index 077bcea1077..335bcac4a7f 100644
--- a/src/plugins/cmakeprojectmanager/cmakeproject.h
+++ b/src/plugins/cmakeprojectmanager/cmakeproject.h
@@ -190,7 +190,6 @@ private:
     QStringList m_compilerOptions;
 
     CMakeBuildTarget m_buildTarget;
-    bool m_buildTargetType;
     QList<CMakeBuildTarget> m_buildTargets;
     QString m_projectName;
     QString m_compiler;