diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2017-05-10 01:25:19 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2017-05-23 16:50:08 +0000 |
| commit | 20149803a44856ea25063077964c1159b6d7a078 (patch) | |
| tree | 4cd0b818e1fbe5861095d7acd516451322570bc6 /src/lib/corelib/buildgraph/depscanner.cpp | |
| parent | 41595d0cf8ac00416a3a8a437eedde2715f75500 (diff) | |
Replace QSharedPointer/QWeakPointer with std::shared_ptr/std::weak_ptr
Change-Id: I2915c578968bed425a8d8b617b56df88ed3f2882
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/lib/corelib/buildgraph/depscanner.cpp')
| -rw-r--r-- | src/lib/corelib/buildgraph/depscanner.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/corelib/buildgraph/depscanner.cpp b/src/lib/corelib/buildgraph/depscanner.cpp index fddacfc5d..2ca4c3e5f 100644 --- a/src/lib/corelib/buildgraph/depscanner.cpp +++ b/src/lib/corelib/buildgraph/depscanner.cpp @@ -189,7 +189,7 @@ bool UserDependencyScanner::recursive() const const void *UserDependencyScanner::key() const { - return m_scanner.data(); + return m_scanner.get(); } QString UserDependencyScanner::createId() const @@ -226,9 +226,9 @@ QStringList UserDependencyScanner::evaluate(Artifact *artifact, const ScriptFunc { ScriptEngineActiveFlagGuard guard(m_engine); - if (artifact->product.data() != m_product) { - m_product = artifact->product.data(); - setupScriptEngineForProduct(m_engine, artifact->product, + if (artifact->product.get() != m_product) { + m_product = artifact->product.get(); + setupScriptEngineForProduct(m_engine, artifact->product.lock(), m_scanner->module, m_global, &m_observer); } |