Remove currently unused information

We were storing every call to getEnv and did not use that information.
We can resurrect this code when a complete environment variable change
tracking feature is implemented.

Change-Id: I2e9b93d62f39cde0dce53181b5f71432c41f630e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

5 files changed, 0 insertions, 17 deletions

diff --git a/src/lib/corelib/language/language.cpp b/src/lib/corelib/language/language.cpp
index f2ace583d..3788114e2 100644
--- a/src/lib/corelib/language/language.cpp
+++ b/src/lib/corelib/language/language.cpp
@@ -1031,7 +1031,6 @@ void TopLevelProject::load(PersistentPool &pool)
 {
     ResolvedProject::load(pool);
     pool.load(m_id);
-    pool.load(usedEnvironment);
     pool.load(canonicalFilePathResults);
     pool.load(fileExistsResults);
     pool.load(directoryEntriesResults);
@@ -1052,7 +1051,6 @@ void TopLevelProject::store(PersistentPool &pool) const
 {
     ResolvedProject::store(pool);
     pool.store(m_id);
-    pool.store(usedEnvironment);
     pool.store(canonicalFilePathResults);
     pool.store(fileExistsResults);
     pool.store(directoryEntriesResults);
diff --git a/src/lib/corelib/language/language.h b/src/lib/corelib/language/language.h
index 64d51a47f..313ba63f4 100644
--- a/src/lib/corelib/language/language.h
+++ b/src/lib/corelib/language/language.h
@@ -517,12 +517,6 @@ public:
     QProcessEnvironment environment;
     QList<ProbeConstPtr> probes;
 
-    // Environment variables requested by the project while resolving.
-    // TODO: This information is currently not used. Remove in 1.5 or use elaborate change tracking
-    //       logic where rules declare the environment variables that could influence their
-    //       behavior.
-    QHash<QString, QString> usedEnvironment;
-
     QHash<QString, QString> canonicalFilePathResults; // Results of calls to "File.canonicalFilePath()."
     QHash<QString, bool> fileExistsResults; // Results of calls to "File.exists()".
     QHash<std::pair<QString, quint32>, QStringList> directoryEntriesResults; // Results of calls to "File.directoryEntries()".
diff --git a/src/lib/corelib/language/projectresolver.cpp b/src/lib/corelib/language/projectresolver.cpp
index 02b1c08c7..b14a3ed25 100644
--- a/src/lib/corelib/language/projectresolver.cpp
+++ b/src/lib/corelib/language/projectresolver.cpp
@@ -250,7 +250,6 @@ TopLevelProjectPtr ProjectResolver::resolveTopLevelProject()
     resolveProject(m_loadResult.root, &projectContext);
     project->setBuildConfiguration(m_setupParams.finalBuildConfigurationTree());
     project->overriddenValues = m_setupParams.overriddenValues();
-    project->usedEnvironment = m_engine->usedEnvironment();
     project->canonicalFilePathResults = m_engine->canonicalFilePathResults();
     project->fileExistsResults = m_engine->fileExistsResults();
     project->directoryEntriesResults = m_engine->directoryEntriesResults();
diff --git a/src/lib/corelib/language/scriptengine.cpp b/src/lib/corelib/language/scriptengine.cpp
index 30ba4381b..5a48f7720 100644
--- a/src/lib/corelib/language/scriptengine.cpp
+++ b/src/lib/corelib/language/scriptengine.cpp
@@ -486,11 +486,6 @@ void ScriptEngine::addResourceAcquiringScriptObject(ResourceAcquiringScriptObjec
     m_resourceAcquiringScriptObjects.push_back(obj);
 }
 
-void ScriptEngine::addEnvironmentVariable(const QString &name, const QString &value)
-{
-    m_usedEnvironment.insert(name, value);
-}
-
 void ScriptEngine::addCanonicalFilePathResult(const QString &filePath,
                                               const QString &resultFilePath)
 {
diff --git a/src/lib/corelib/language/scriptengine.h b/src/lib/corelib/language/scriptengine.h
index 802587cce..d9ddffdb0 100644
--- a/src/lib/corelib/language/scriptengine.h
+++ b/src/lib/corelib/language/scriptengine.h
@@ -138,8 +138,6 @@ public:
 
     QProcessEnvironment environment() const;
     void setEnvironment(const QProcessEnvironment &env);
-    void addEnvironmentVariable(const QString &name, const QString &value);
-    QHash<QString, QString> usedEnvironment() const { return m_usedEnvironment; }
     void addCanonicalFilePathResult(const QString &filePath, const QString &resultFilePath);
     void addFileExistsResult(const QString &filePath, bool exists);
     void addDirectoryEntriesResult(const QString &path, QDir::Filters filters,
@@ -251,7 +249,6 @@ private:
     QScriptValue m_definePropertyFunction;
     QScriptValue m_emptyFunction;
     QProcessEnvironment m_environment;
-    QHash<QString, QString> m_usedEnvironment;
     QHash<QString, QString> m_canonicalFilePathResult;
     QHash<QString, bool> m_fileExistsResult;
     QHash<std::pair<QString, quint32>, QStringList> m_directoryEntriesResult;