diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-05-17 10:35:56 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-05-19 09:20:43 +0000 |
| commit | 7d5ce4284badb1fd54a67938039d0a1908f34370 (patch) | |
| tree | 8728b6e3e13fd35b4187f2eb6cc2bcdc7b98f69e /src/qml/qml/qqmlincubator.cpp | |
| parent | d63a75164a76410d4fe10fe2503d7087f0dd71d8 (diff) | |
Cleanup
Remove two dummy forwarding functions
Change-Id: I053f9aecc761772c932550a0ddbea390621049c1
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Diffstat (limited to 'src/qml/qml/qqmlincubator.cpp')
| -rw-r--r-- | src/qml/qml/qqmlincubator.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlincubator.cpp b/src/qml/qml/qqmlincubator.cpp index 235aa1bf44..eba93bfb1a 100644 --- a/src/qml/qml/qqmlincubator.cpp +++ b/src/qml/qml/qqmlincubator.cpp @@ -281,7 +281,7 @@ void QQmlIncubatorPrivate::incubate(QQmlInstantiationInterrupt &i) if (!compiledData) return; - QML_MEMORY_SCOPE_URL(compiledData->url()); + QML_MEMORY_SCOPE_URL(compiledData->compilationUnit->url()); QExplicitlySharedDataPointer<QQmlIncubatorPrivate> protectThis(this); @@ -292,7 +292,7 @@ void QQmlIncubatorPrivate::incubate(QQmlInstantiationInterrupt &i) if (!vmeGuard.isOK()) { QQmlError error; - error.setUrl(compiledData->url()); + error.setUrl(compiledData->compilationUnit->url()); error.setDescription(QQmlComponent::tr("Object destroyed during incubation")); errors << error; progress = QQmlIncubatorPrivate::Completed; |