diff options
| author | Martin Jones <martin.jones@nokia.com> | 2011-01-05 03:57:17 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2011-01-05 03:57:17 (GMT) |
| commit | ffd499eb6ff64df1833625f64dbbf92e0e0746d4 (patch) | |
| tree | cb1dcd382fe2e76638cf853c96cf0316cce65636 /src/declarative/qml/qdeclarativevme.cpp | |
| parent | 3f80a24c5d375dd173d18c2a4227301f1afba2e3 (diff) | |
| download | Qt-ffd499eb6ff64df1833625f64dbbf92e0e0746d4.zip Qt-ffd499eb6ff64df1833625f64dbbf92e0e0746d4.tar.gz Qt-ffd499eb6ff64df1833625f64dbbf92e0e0746d4.tar.bz2 | |
Support property/method versions in QML
Use metaobject revisioning to exclude properties/revisions added in
later versions from interfering with earlier versions.
Task-number: QTBUG-13451
Reviewed-by: Aaron Kennedy
Diffstat (limited to 'src/declarative/qml/qdeclarativevme.cpp')
| -rw-r--r-- | src/declarative/qml/qdeclarativevme.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/declarative/qml/qdeclarativevme.cpp b/src/declarative/qml/qdeclarativevme.cpp index c742dec..6ee653b 100644 --- a/src/declarative/qml/qdeclarativevme.cpp +++ b/src/declarative/qml/qdeclarativevme.cpp @@ -194,6 +194,8 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEStack<QObject *> &stack, QDeclarativeData *ddata = QDeclarativeData::get(o); Q_ASSERT(ddata); + if (types.at(instr.create.type).type) + ddata->type = types.at(instr.create.type).type; if (stack.isEmpty()) { if (ddata->context) { @@ -249,6 +251,8 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEStack<QObject *> &stack, QDeclarativeData *ddata = (QDeclarativeData *)(((const char *)o) + instr.createSimple.typeSize); + if (types.at(instr.createSimple.type).type) + ddata->type = types.at(instr.createSimple.type).type; ddata->lineNumber = instr.line; ddata->columnNumber = instr.createSimple.column; |