diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2014-01-24 22:55:39 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-31 11:13:48 +0100 |
| commit | a78a48c5328ea746dfd161599894a4a5b11041bd (patch) | |
| tree | 1e38f4334a8e3efdb5761d862baaa465141bf543 /src/qml/qml/qqmlcomponent.cpp | |
| parent | d96478044ae0dfbcc35113e3941aa79604ba83a0 (diff) | |
Cleanups
Remove SafeValue, it was used to port over to an exact GC. Since
we now have that, we can now safely merge it with QV4::Value
again. Also rename SafeString to StringValue for better naming
consistency.
Change-Id: I8553d1bec5134c53996f6b0d758738a0ec8a2e4d
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlcomponent.cpp')
| -rw-r--r-- | src/qml/qml/qqmlcomponent.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp index a36150ee42..898a00a9bb 100644 --- a/src/qml/qml/qqmlcomponent.cpp +++ b/src/qml/qml/qqmlcomponent.cpp @@ -1085,9 +1085,9 @@ public: QScopedPointer<QQmlComponentIncubator> incubator; QV8Engine *v8; QPointer<QObject> parent; - QV4::SafeValue valuemap; - QV4::SafeValue qmlGlobal; - QV4::SafeValue m_statusChanged; + QV4::Value valuemap; + QV4::Value qmlGlobal; + QV4::Value m_statusChanged; void statusChanged(QQmlIncubator::Status); void setInitialState(QObject *); |