feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

prune dead code surrounding isDeployable

Browse Source 
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>
This commit is contained in:
Oswald Buddenhagen
2016-10-21 21:08:01 +02:00
parent 3c43c35167
commit fde9758fcb
2 changed files with 0 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/qmakeprojectmanager/qmakenodes.cpp
View File

@@ -237,7 +237,6 @@ public:
TargetInformation targetInformation; TargetInformation targetInformation;
InstallsList installsList; InstallsList installsList;
QHash<QmakeVariable, QStringList> newVarValues; QHash<QmakeVariable, QStringList> newVarValues;
bool isDeployable;
QStringList errors; QStringList errors;
}; };
@@ -1614,11 +1613,6 @@ QByteArray QmakeProFileNode::cxxDefines() const
return result; return result;
} }
bool QmakeProFileNode::isDeployable() const
{
return m_isDeployable;
}
/*! /*!
\class QmakeProFileNode \class QmakeProFileNode
Implements abstract ProjectNode class Implements abstract ProjectNode class
@@ -1991,19 +1985,6 @@ EvalResult *QmakeProFileNode::evaluate(const EvalInput &input)
result->newVarValues[QmakeCc] = input.readerExact->values("QMAKE_CC"); result->newVarValues[QmakeCc] = input.readerExact->values("QMAKE_CC");
result->newVarValues[QmakeCxx] = input.readerExact->values("QMAKE_CXX"); 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) if (readerBuildPass && readerBuildPass != input.readerExact)
delete readerBuildPass; delete readerBuildPass;
} }
@@ -2253,7 +2234,6 @@ void QmakeProFileNode::applyEvaluate(EvalResult *evalResult)
m_subProjectsNotToDeploy = result->subProjectsNotToDeploy; m_subProjectsNotToDeploy = result->subProjectsNotToDeploy;
m_installsList = result->installsList; m_installsList = result->installsList;
m_isDeployable = result->isDeployable;
if (m_varValues != result->newVarValues) if (m_varValues != result->newVarValues)
m_varValues = result->newVarValues; m_varValues = result->newVarValues;

3
src/plugins/qmakeprojectmanager/qmakenodes.h
View File

@@ -354,7 +354,6 @@ public:
QString objectExtension() const; QString objectExtension() const;
QString objectsDirectory() const; QString objectsDirectory() const;
QByteArray cxxDefines() const; QByteArray cxxDefines() const;
bool isDeployable() const;
enum AsyncUpdateDelay { ParseNow, ParseLater }; enum AsyncUpdateDelay { ParseNow, ParseLater };
void scheduleUpdate(AsyncUpdateDelay delay); 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 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); static InstallsList installsList(const QtSupport::ProFileReader *reader, const QString &projectFilePath, const QString &projectDir);
bool m_isDeployable = false;
bool m_validParse = false; bool m_validParse = false;
bool m_parseInProgress = true; bool m_parseInProgress = true;