diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2011-09-05 17:31:41 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-29 06:12:49 +0200 |
commit | 703c808a5649169dd6b9605af273374cd62951d1 (patch) | |
tree | 7248cc72bfa632a51c814d6622f0b12a7f2bd443 /src/declarative/qml/qdeclarativescript.cpp | |
parent | 600e56ad053362dd5d4150f5dec6b93c2fee575b (diff) |
Asynchronous component instantiation
This introduces two main:
* the QML compiler executes in a separate thread
* item instantiation can be interrupted and resumed to
allow it to be split across multiple frames.
Task-number: QTBUG-21151
Change-Id: I9631c62bb77da3a2e0c37f0da3719533fdce4fef
Reviewed-on: http://codereview.qt-project.org/5676
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/declarative/qml/qdeclarativescript.cpp')
-rw-r--r-- | src/declarative/qml/qdeclarativescript.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/declarative/qml/qdeclarativescript.cpp b/src/declarative/qml/qdeclarativescript.cpp index 55a6b2b2cf..9e6e09ed0c 100644 --- a/src/declarative/qml/qdeclarativescript.cpp +++ b/src/declarative/qml/qdeclarativescript.cpp @@ -307,7 +307,6 @@ bool QDeclarativeScript::Variant::asBoolean() const QString QDeclarativeScript::Variant::asString() const { if (t == String) { - // XXX aakenned return l->value.toString(); } else { return asWritten.toString(); @@ -379,7 +378,6 @@ QString QDeclarativeScript::Variant::asScript() const return escapedString(asString()); case Script: if (AST::IdentifierExpression *i = AST::cast<AST::IdentifierExpression *>(n)) { - // XXX aakenned return i->name.toString(); } else return asWritten.toString(); |