From fde9758fcba78d3371063883be7cb355f15903e5 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Date: Fri, 21 Oct 2016 21:08:01 +0200
Subject: [PATCH] prune dead code surrounding isDeployable

no-one ever queried this state since S60 support was removed in
ae23d50576 (2012).

Change-Id: I3e05d90bb43514b4c326e124834cf9c5e89a0168
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 .../qmakeprojectmanager/qmakenodes.cpp        | 20 -------------------
 src/plugins/qmakeprojectmanager/qmakenodes.h  |  3 ---
 2 files changed, 23 deletions(-)

diff --git a/src/plugins/qmakeprojectmanager/qmakenodes.cpp b/src/plugins/qmakeprojectmanager/qmakenodes.cpp
index 3507ba80b85..878553e96b3 100644
--- a/src/plugins/qmakeprojectmanager/qmakenodes.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakenodes.cpp
@@ -237,7 +237,6 @@ public:
     TargetInformation targetInformation;
     InstallsList installsList;
     QHash<QmakeVariable, QStringList> newVarValues;
-    bool isDeployable;
     QStringList errors;
 };
 
@@ -1614,11 +1613,6 @@ QByteArray QmakeProFileNode::cxxDefines() const
     return result;
 }
 
-bool QmakeProFileNode::isDeployable() const
-{
-    return m_isDeployable;
-}
-
 /*!
   \class QmakeProFileNode
   Implements abstract ProjectNode class
@@ -1991,19 +1985,6 @@ EvalResult *QmakeProFileNode::evaluate(const EvalInput &input)
         result->newVarValues[QmakeCc] = input.readerExact->values("QMAKE_CC");
         result->newVarValues[QmakeCxx] = input.readerExact->values("QMAKE_CXX");
 
-        result->isDeployable = false;
-        if (result->projectType == ApplicationTemplate) {
-            result->isDeployable = true;
-        } else {
-            foreach (const QString &item, input.readerExact->values(QLatin1String("DEPLOYMENT"))) {
-                if (!input.readerExact->values(item + QLatin1String(".sources")).isEmpty()) {
-                    result->isDeployable = true;
-                    break;
-                }
-            }
-        }
-
-
         if (readerBuildPass && readerBuildPass != input.readerExact)
             delete readerBuildPass;
     }
@@ -2253,7 +2234,6 @@ void QmakeProFileNode::applyEvaluate(EvalResult *evalResult)
 
         m_subProjectsNotToDeploy = result->subProjectsNotToDeploy;
         m_installsList = result->installsList;
-        m_isDeployable = result->isDeployable;
 
         if (m_varValues != result->newVarValues)
             m_varValues = result->newVarValues;
diff --git a/src/plugins/qmakeprojectmanager/qmakenodes.h b/src/plugins/qmakeprojectmanager/qmakenodes.h
index 5a1568e0d8e..32d3034470a 100644
--- a/src/plugins/qmakeprojectmanager/qmakenodes.h
+++ b/src/plugins/qmakeprojectmanager/qmakenodes.h
@@ -354,7 +354,6 @@ public:
     QString objectExtension() const;
     QString objectsDirectory() const;
     QByteArray cxxDefines() const;
-    bool isDeployable() const;
 
     enum AsyncUpdateDelay { ParseNow, ParseLater };
     void scheduleUpdate(AsyncUpdateDelay delay);
@@ -401,8 +400,6 @@ private:
     static TargetInformation targetInformation(QtSupport::ProFileReader *reader, QtSupport::ProFileReader *readerBuildPass, const QString &buildDir, const QString &projectFilePath);
     static InstallsList installsList(const QtSupport::ProFileReader *reader, const QString &projectFilePath, const QString &projectDir);
 
-    bool m_isDeployable = false;
-
     bool m_validParse = false;
     bool m_parseInProgress = true;