diff options
-rw-r--r-- | src/lib/corelib/api/project.cpp | 7 | ||||
-rw-r--r-- | src/lib/corelib/api/project.h | 1 | ||||
-rw-r--r-- | src/lib/corelib/jsextensions/environmentextension.cpp | 6 | ||||
-rw-r--r-- | src/lib/corelib/language/language.cpp | 2 | ||||
-rw-r--r-- | src/lib/corelib/language/language.h | 6 | ||||
-rw-r--r-- | src/lib/corelib/language/projectresolver.cpp | 1 | ||||
-rw-r--r-- | src/lib/corelib/language/scriptengine.cpp | 5 | ||||
-rw-r--r-- | src/lib/corelib/language/scriptengine.h | 3 | ||||
-rw-r--r-- | src/lib/corelib/tools/persistence.cpp | 2 |
9 files changed, 1 insertions, 32 deletions
diff --git a/src/lib/corelib/api/project.cpp b/src/lib/corelib/api/project.cpp index 9041b4e7a..19b2072f9 100644 --- a/src/lib/corelib/api/project.cpp +++ b/src/lib/corelib/api/project.cpp @@ -1097,13 +1097,6 @@ QVariantMap Project::projectConfiguration() const return d->internalProject->buildConfiguration(); } -QHash<QString, QString> Project::usedEnvironment() const -{ - typedef QHash<QString, QString> EnvType; - QBS_ASSERT(isValid(), return EnvType()); - return d->internalProject->usedEnvironment; -} - std::set<QString> Project::buildSystemFiles() const { QBS_ASSERT(isValid(), return std::set<QString>()); diff --git a/src/lib/corelib/api/project.h b/src/lib/corelib/api/project.h index 034db2625..1b80d59cf 100644 --- a/src/lib/corelib/api/project.h +++ b/src/lib/corelib/api/project.h @@ -130,7 +130,6 @@ public: bool recursive, const QStringList &tags = QStringList()) const; QVariantMap projectConfiguration() const; - QHash<QString, QString> usedEnvironment() const; std::set<QString> buildSystemFiles() const; diff --git a/src/lib/corelib/jsextensions/environmentextension.cpp b/src/lib/corelib/jsextensions/environmentextension.cpp index 06e5e0765..39a57a17b 100644 --- a/src/lib/corelib/jsextensions/environmentextension.cpp +++ b/src/lib/corelib/jsextensions/environmentextension.cpp @@ -112,12 +112,6 @@ QScriptValue EnvironmentExtension::js_getEnv(QScriptContext *context, QScriptEng const QString name = context->argument(0).toString(); const QString value = procenv->value(name); - - // Don't track environment variable access inside environment setup scripts - // since change tracking is irrelevant for them - if (procenv == &env) - static_cast<ScriptEngine *>(engine)->addEnvironmentVariable(name, value); - return value.isNull() ? engine->undefinedValue() : value; } 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; diff --git a/src/lib/corelib/tools/persistence.cpp b/src/lib/corelib/tools/persistence.cpp index 0fcf4880d..1d236fb6b 100644 --- a/src/lib/corelib/tools/persistence.cpp +++ b/src/lib/corelib/tools/persistence.cpp @@ -50,7 +50,7 @@ namespace qbs { namespace Internal { -static const char QBS_PERSISTENCE_MAGIC[] = "QBSPERSISTENCE_106"; +static const char QBS_PERSISTENCE_MAGIC[] = "QBSPERSISTENCE_107"; NoBuildGraphError::NoBuildGraphError() : ErrorInfo(Tr::tr("No build graph exists yet for this configuration.")) |