diff options
Diffstat (limited to 'src/lib/corelib')
-rw-r--r-- | src/lib/corelib/buildgraph/executor.cpp | 21 | ||||
-rw-r--r-- | src/lib/corelib/corelib.qbs | 4 | ||||
-rw-r--r-- | src/lib/corelib/language/moduleloader.cpp | 5 | ||||
-rw-r--r-- | src/lib/corelib/language/projectresolver.cpp | 16 | ||||
-rw-r--r-- | src/lib/corelib/language/scriptengine.cpp | 7 |
5 files changed, 37 insertions, 16 deletions
diff --git a/src/lib/corelib/buildgraph/executor.cpp b/src/lib/corelib/buildgraph/executor.cpp index 24f484ad2..8713b9b41 100644 --- a/src/lib/corelib/buildgraph/executor.cpp +++ b/src/lib/corelib/buildgraph/executor.cpp @@ -771,8 +771,7 @@ void Executor::rescueOldBuildData(Artifact *artifact, bool *childrenAdded = 0) return; qCDebug(lcBuildGraph) << "Attempting to rescue data of artifact" << artifact->fileName(); - typedef std::pair<Artifact *, bool> ChildArtifactData; - QList<ChildArtifactData> childrenToConnect; + std::vector<Artifact *> childrenToConnect; bool canRescue = artifact->transformer->commands == rad.commands; if (canRescue) { ResolvedProductPtr pseudoProduct = ResolvedProduct::create(); @@ -796,10 +795,15 @@ void Executor::rescueOldBuildData(Artifact *artifact, bool *childrenAdded = 0) removeGeneratedArtifactFromDisk(cd.childFilePath, m_logger); } } - // TODO: Shouldn't addedByScanner always be true here? Otherwise the child would be - // in the list already, no? + if (!cd.addedByScanner) { + // If an artifact has disappeared from the list of children, the commands + // might need to run again. + canRescue = false; + qCDebug(lcBuildGraph) << "Former child artifact" << cd.childFilePath << + "is no longer in the list of children"; + } if (canRescue) - childrenToConnect.push_back({child, cd.addedByScanner}); + childrenToConnect.push_back(child); } for (const QString &depPath : rad.fileDependencies) { const QList<FileResourceBase *> depList = m_project->buildData->lookupFiles(depPath); @@ -865,10 +869,9 @@ void Executor::rescueOldBuildData(Artifact *artifact, bool *childrenAdded = 0) artifact->knownOutOfDate = artifact->knownOutOfDate || rad.knownOutOfDate; if (childrenAdded && !childrenToConnect.empty()) *childrenAdded = true; - for (const ChildArtifactData &cad : qAsConst(childrenToConnect)) { - safeConnect(artifact, cad.first); - if (cad.second) - artifact->childrenAddedByScanner << cad.first; + for (Artifact * const child : childrenToConnect) { + safeConnect(artifact, child); + artifact->childrenAddedByScanner << child; } qCDebug(lcBuildGraph) << "Data was rescued."; } else { diff --git a/src/lib/corelib/corelib.qbs b/src/lib/corelib/corelib.qbs index fd25d30e0..08733b624 100644 --- a/src/lib/corelib/corelib.qbs +++ b/src/lib/corelib/corelib.qbs @@ -17,7 +17,9 @@ QbsLibrary { Depends { condition: qbsbuildconfig.enableProjectFileUpdates; name: "Qt.gui" } Depends { condition: staticBuild; productTypes: ["qbsplugin"] } name: "qbscore" - cpp.includePaths: base.concat([ + property stringList bundledQtScriptIncludes: qbsbuildconfig.useBundledQtScript + || !Qt.script.present ? qbsscriptengine.includePaths : [] + cpp.includePaths: base.concat(bundledQtScriptIncludes).concat([ ".", "../.." // for the plugin headers ]) diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp index 933c49abc..df47e36ea 100644 --- a/src/lib/corelib/language/moduleloader.cpp +++ b/src/lib/corelib/language/moduleloader.cpp @@ -581,6 +581,8 @@ void ModuleLoader::handleTopLevelProject(ModuleLoaderResult *loadResult, Item *p for (ProductContext * const p : productSorter.sortedProducts()) { try { handleProduct(p); + if (p->name.startsWith(shadowProductPrefix())) + tlp.probes << p->info.probes; } catch (const ErrorInfo &err) { handleProductError(err, p); } @@ -3418,7 +3420,8 @@ void ModuleLoader::resolveProbe(ProductContext *productContext, Item *parent, It const bool condition = m_evaluator->boolValue(probe, StringConstants::conditionProperty()); const QString &sourceCode = configureScript->sourceCode().toString(); ProbeConstPtr resolvedProbe; - if (parent->type() == ItemType::Project) { + if (parent->type() == ItemType::Project + || productContext->name.startsWith(shadowProductPrefix())) { resolvedProbe = findOldProjectProbe(probeId, condition, initialProperties, sourceCode); } else { const QString &uniqueProductName = productContext->uniqueName(); diff --git a/src/lib/corelib/language/projectresolver.cpp b/src/lib/corelib/language/projectresolver.cpp index b7535c2eb..ff74f845a 100644 --- a/src/lib/corelib/language/projectresolver.cpp +++ b/src/lib/corelib/language/projectresolver.cpp @@ -1682,7 +1682,21 @@ void ProjectResolver::evaluateProperty(const Item *item, const QString &propName // NOTE: Loses type information if scriptValue.isUndefined == true, // as such QScriptValues become invalid QVariants. - QVariant v = scriptValue.isFunction() ? scriptValue.toString() : scriptValue.toVariant(); + QVariant v; + if (scriptValue.isFunction()) { + v = scriptValue.toString(); + } else { + v = scriptValue.toVariant(); + QVariantMap m = v.toMap(); + if (m.contains(StringConstants::importScopeNamePropertyInternal())) { + QVariantMap tmp = m; + m = scriptValue.prototype().toVariant().toMap(); + for (auto it = tmp.begin(); it != tmp.end(); ++it) + m.insert(it.key(), it.value()); + v = m; + } + } + if (pd.type() == PropertyDeclaration::Path && v.isValid()) { v = v.toString(); } else if (pd.type() == PropertyDeclaration::PathList diff --git a/src/lib/corelib/language/scriptengine.cpp b/src/lib/corelib/language/scriptengine.cpp index 568a927b2..e983ae945 100644 --- a/src/lib/corelib/language/scriptengine.cpp +++ b/src/lib/corelib/language/scriptengine.cpp @@ -152,6 +152,7 @@ void ScriptEngine::import(const FileContextBaseConstPtr &fileCtx, QScriptValue & if (m_observeMode == ObserveMode::Enabled) { for (QScriptValue &sv : m_requireResults) observeImport(sv); + m_requireResults.clear(); } m_currentDirPathStack.pop(); @@ -507,8 +508,7 @@ QScriptValue ScriptEngine::js_require(QScriptContext *context, QScriptEngine *qt if (!values.empty()) { const QScriptValue mergedValue = mergeExtensionObjects(values); - if (engine->m_observeMode == ObserveMode::Enabled) - engine->m_requireResults.push_back(mergedValue); + engine->m_requireResults.push_back(mergedValue); engine->m_filePathsPerImport[mergedValue.objectId()] = filePaths; return mergedValue; } @@ -533,8 +533,7 @@ QScriptValue ScriptEngine::js_require(QScriptContext *context, QScriptEngine *qt const QString scopeName = scopeNamePrefix + QString::number(qHash(filePath), 16); result.setProperty(StringConstants::importScopeNamePropertyInternal(), scopeName); context->thisObject().setProperty(scopeName, result); - if (engine->m_observeMode == ObserveMode::Enabled) - engine->m_requireResults.push_back(result); + engine->m_requireResults.push_back(result); engine->m_filePathsPerImport[result.objectId()] = { filePath }; } catch (const ErrorInfo &e) { result = context->throwError(e.toString()); |