diff options
author | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2015-04-24 11:03:54 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2015-04-24 14:01:57 +0000 |
commit | 6a8a7f4fb25ff7259ed66de70b9b4f956dfe0e14 (patch) | |
tree | 57b17dba66a2678f40f4d65d60a18dc576fb7073 /src/lib/corelib/buildgraph/inputartifactscanner.cpp | |
parent | 04fab8951118242c5243113c3452a4c316a35ce9 (diff) |
Do not process events in custom scanners' script engines.
Otherwise we will get calls to slots in the executor
at points in time where none are expected.
Note: This means that custom scanner scripts become non-interruptible.
It is not clear if and how we can fix the relevant bug otherwise.
Putting the input artifact scanner into its own thread seems even more
problematic.
Task-number: QBS-782
Change-Id: I44edebfb2a38dc00062cdb9572991ff9352ddd9f
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'src/lib/corelib/buildgraph/inputartifactscanner.cpp')
-rw-r--r-- | src/lib/corelib/buildgraph/inputartifactscanner.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/lib/corelib/buildgraph/inputartifactscanner.cpp b/src/lib/corelib/buildgraph/inputartifactscanner.cpp index e14d0ec45..620eca1cb 100644 --- a/src/lib/corelib/buildgraph/inputartifactscanner.cpp +++ b/src/lib/corelib/buildgraph/inputartifactscanner.cpp @@ -210,7 +210,6 @@ QSet<DependencyScanner *> InputArtifactScanner::scannersForArtifact(const Artifa { QSet<DependencyScanner *> scanners; ResolvedProduct *product = artifact->product.data(); - ScriptEngine *engine = product->topLevelProject()->buildData->evaluationContext->engine(); QHash<FileTag, InputArtifactScannerContext::DependencyScannerCacheItem> &scannerCache = m_context->scannersCache[product]; foreach (const FileTag &fileTag, artifact->fileTags()) { @@ -224,7 +223,7 @@ QSet<DependencyScanner *> InputArtifactScanner::scannersForArtifact(const Artifa foreach (const ResolvedScannerConstPtr &scanner, product->scanners) { if (scanner->inputs.contains(fileTag)) { cache.scanners += DependencyScannerPtr( - new UserDependencyScanner(scanner, m_logger, engine)); + new UserDependencyScanner(scanner, m_logger)); break; } } |