diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-04-22 03:18:13 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-04-22 03:18:13 (GMT) |
| commit | fb94bfda66ac8767c96cb521a1f77c6b8be5bb95 (patch) | |
| tree | b4fdd4165ff33ed78d9485c089afb2e11b526e18 /src/declarative/qml/qdeclarativecompiler.cpp | |
| parent | 6b03492619243a1ede75ba324b8422304c662231 (diff) | |
| parent | e6b5d2a4df73aa26812e26daa3199443bd84cc90 (diff) | |
| download | Qt-fb94bfda66ac8767c96cb521a1f77c6b8be5bb95.zip Qt-fb94bfda66ac8767c96cb521a1f77c6b8be5bb95.tar.gz Qt-fb94bfda66ac8767c96cb521a1f77c6b8be5bb95.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/qml/qdeclarativecompiler.cpp')
| -rw-r--r-- | src/declarative/qml/qdeclarativecompiler.cpp | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp index edafe59..1727687 100644 --- a/src/declarative/qml/qdeclarativecompiler.cpp +++ b/src/declarative/qml/qdeclarativecompiler.cpp @@ -2809,25 +2809,6 @@ bool QDeclarativeCompiler::canCoerce(int to, QDeclarativeParser::Object *from) return false; } -/*! - Returns true if from can be assigned to a (QObject) property of type - to. -*/ -bool QDeclarativeCompiler::canCoerce(int to, int from) -{ - const QMetaObject *toMo = - QDeclarativeEnginePrivate::get(engine)->rawMetaObjectForType(to); - const QMetaObject *fromMo = - QDeclarativeEnginePrivate::get(engine)->rawMetaObjectForType(from); - - while (fromMo) { - if (QDeclarativePropertyPrivate::equal(fromMo, toMo)) - return true; - fromMo = fromMo->superClass(); - } - return false; -} - QDeclarativeType *QDeclarativeCompiler::toQmlType(QDeclarativeParser::Object *from) { // ### Optimize |