diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-01-11 05:48:43 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-01-11 05:48:43 (GMT) |
| commit | aa6ec25bdf0e69873b537e05d4511543b21f3e8a (patch) | |
| tree | 7ca99c20c7cb5acdce8b111dd0eba72c372ec3df /src/declarative/qml/qmlcompiler.cpp | |
| parent | 5832eb0354634efd29cbe55558000e51cb68ec40 (diff) | |
| parent | 8fa3f3f7f038f10dcd2bbd160f04275fe0efaadf (diff) | |
| download | Qt-aa6ec25bdf0e69873b537e05d4511543b21f3e8a.zip Qt-aa6ec25bdf0e69873b537e05d4511543b21f3e8a.tar.gz Qt-aa6ec25bdf0e69873b537e05d4511543b21f3e8a.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/qml/qmlcompiler.cpp')
| -rw-r--r-- | src/declarative/qml/qmlcompiler.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/declarative/qml/qmlcompiler.cpp b/src/declarative/qml/qmlcompiler.cpp index 7f8bc7a..3b2009a 100644 --- a/src/declarative/qml/qmlcompiler.cpp +++ b/src/declarative/qml/qmlcompiler.cpp @@ -2776,9 +2776,6 @@ QmlType *QmlCompiler::toQmlType(QmlParser::Object *from) QStringList QmlCompiler::deferredProperties(QmlParser::Object *obj) { - if (!qmlExperimental()) - return QStringList(); - const QMetaObject *mo = obj->metatype; int idx = mo->indexOfClassInfo("DeferredPropertyNames"); |