diff options
author | The Qt Project <gerrit-noreply@qt-project.org> | 2019-05-24 11:49:33 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2019-05-24 11:49:33 +0000 |
commit | 9ca0b41dd60575fdc579dd83a10702c80886cac3 (patch) | |
tree | 225de48f365ee9ea063caff958d959482be27895 /src | |
parent | cede3e176386a835f0f5d348dfce964d65d4772c (diff) | |
parent | 4a12d020600643d6fcbf65a3da7bc1c21fda6970 (diff) |
Merge "Merge 1.13 into master"
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/corelib/api/internaljobs.cpp | 5 | ||||
-rw-r--r-- | src/lib/corelib/buildgraph/transformer.cpp | 4 | ||||
-rw-r--r-- | src/lib/corelib/language/language.cpp | 11 | ||||
-rw-r--r-- | src/lib/corelib/language/language.h | 2 |
4 files changed, 17 insertions, 5 deletions
diff --git a/src/lib/corelib/api/internaljobs.cpp b/src/lib/corelib/api/internaljobs.cpp index c3313cc13..5cd4bd439 100644 --- a/src/lib/corelib/api/internaljobs.cpp +++ b/src/lib/corelib/api/internaljobs.cpp @@ -269,8 +269,11 @@ void InternalSetupProjectJob::start() deleteLocker = true; } execute(); - if (m_existingProject) + if (m_existingProject) { + if (m_existingProject != m_newProject) + m_existingProject->makeModuleProvidersNonTransient(); m_existingProject->bgLocker = nullptr; + } m_newProject->bgLocker = bgLocker; deleteLocker = false; } catch (const ErrorInfo &error) { diff --git a/src/lib/corelib/buildgraph/transformer.cpp b/src/lib/corelib/buildgraph/transformer.cpp index 0a4fa17f9..cc0b4c923 100644 --- a/src/lib/corelib/buildgraph/transformer.cpp +++ b/src/lib/corelib/buildgraph/transformer.cpp @@ -103,9 +103,9 @@ static QScriptValue js_children(QScriptContext *ctx, QScriptEngine *engine, cons Q_UNUSED(ctx); QScriptValue sv = engine->newArray(); uint idx = 0; - for (const Artifact *parent : artifact->childArtifacts()) { + for (const Artifact *child : artifact->childArtifacts()) { sv.setProperty(idx++, Transformer::translateFileConfig(static_cast<ScriptEngine *>(engine), - parent, QString())); + child, QString())); } return sv; } diff --git a/src/lib/corelib/language/language.cpp b/src/lib/corelib/language/language.cpp index 9c9313e17..d888700c5 100644 --- a/src/lib/corelib/language/language.cpp +++ b/src/lib/corelib/language/language.cpp @@ -622,6 +622,12 @@ QString TopLevelProject::profile() const return projectProperties().value(StringConstants::profileProperty()).toString(); } +void TopLevelProject::makeModuleProvidersNonTransient() +{ + for (ModuleProviderInfo &m : moduleProviderInfo) + m.transientOutput = false; +} + QString TopLevelProject::buildGraphFilePath() const { return ProjectBuildData::deriveBuildGraphFilePath(buildDirectory, id()); @@ -637,8 +643,9 @@ void TopLevelProject::store(Logger logger) qCDebug(lcBuildGraph) << "build graph is unchanged in project" << id(); return; } - for (ModuleProviderInfo &m : moduleProviderInfo) - m.transientOutput = false; + + makeModuleProvidersNonTransient(); + const QString fileName = buildGraphFilePath(); qCDebug(lcBuildGraph) << "storing:" << fileName; PersistentPool pool(logger); diff --git a/src/lib/corelib/language/language.h b/src/lib/corelib/language/language.h index 3dbe90747..65879dd56 100644 --- a/src/lib/corelib/language/language.h +++ b/src/lib/corelib/language/language.h @@ -707,6 +707,8 @@ public: const QVariantMap &buildConfiguration() const { return m_buildConfiguration; } QString id() const { return m_id; } QString profile() const; + void makeModuleProvidersNonTransient(); + QVariantMap profileConfigs; QVariantMap overriddenValues; |