aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qt4projectmanager/qt4nodes.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/qt4projectmanager/qt4nodes.cpp')
-rw-r--r--src/plugins/qt4projectmanager/qt4nodes.cpp54
1 files changed, 0 insertions, 54 deletions
diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp
index 4f04f945a06..33c9dea516e 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.cpp
+++ b/src/plugins/qt4projectmanager/qt4nodes.cpp
@@ -1918,7 +1918,6 @@ void Qt4ProFileNode::applyEvaluate(EvalResult evalResult, bool async)
m_subProjectsNotToDeploy = subProjectsNotToDeploy;
setupInstallsList(m_readerExact);
- setupProjectVersion(m_readerExact);
// update other variables
QHash<Qt4Variable, QStringList> newVarValues;
@@ -2342,59 +2341,6 @@ void Qt4ProFileNode::setupInstallsList(const QtSupport::ProFileReader *reader)
}
}
-void Qt4ProFileNode::setupProjectVersion(const QtSupport::ProFileReader *reader)
-{
- m_projectVersion.major = m_projectVersion.minor = m_projectVersion.patch = -1;
- bool ok;
- int val = reader->value(QLatin1String("VER_MAJ")).toInt(&ok);
- if (ok)
- m_projectVersion.major = val;
- val = reader->value(QLatin1String("VER_MIN")).toInt(&ok);
- if (ok)
- m_projectVersion.minor = val;
- val = reader->value(QLatin1String("VER_PAT")).toInt(&ok);
- if (ok)
- m_projectVersion.patch = val;
- if (m_projectVersion.major != -1 && m_projectVersion.minor != -1
- && m_projectVersion.patch != -1) {
- return;
- }
-
- const QString &version = reader->value(QLatin1String("VERSION"));
- const QChar dot(QLatin1Char('.'));
- int dotIndex = version.indexOf(dot);
- if (m_projectVersion.major == -1) {
- val = version.left(dotIndex).toInt(&ok);
- if (ok)
- m_projectVersion.major = val;
- }
- if (dotIndex != -1) {
- int numberStartIndex = dotIndex + 1;
- dotIndex = version.indexOf(dot, numberStartIndex);
- if (m_projectVersion.minor == -1) {
- val = version.mid(numberStartIndex, dotIndex - numberStartIndex).toInt(&ok);
- if (ok)
- m_projectVersion.minor = val;
- }
- }
- if (dotIndex != -1) {
- int numberStartIndex = dotIndex + 1;
- dotIndex = version.indexOf(dot, numberStartIndex);
- if (m_projectVersion.patch == -1) {
- val = version.mid(numberStartIndex, dotIndex - numberStartIndex).toInt(&ok);
- if (ok)
- m_projectVersion.patch= val;
- }
- }
-
- if (m_projectVersion.major == -1)
- m_projectVersion.major = 1;
- if (m_projectVersion.minor == -1)
- m_projectVersion.minor = 0;
- if (m_projectVersion.patch == -1)
- m_projectVersion.patch = 0;
-}
-
InstallsList Qt4ProFileNode::installsList() const
{
return m_installsList;