diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2010-10-01 05:28:48 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-10-01 05:28:48 (GMT) |
| commit | dcc5c7ea047513ceb6fc75aac526b17ad6629d4c (patch) | |
| tree | eb35c11d8ed04c467a1bfee1fe6da06f93fe686d /src/declarative/qml/qdeclarativedom.cpp | |
| parent | 94aa8a639de93861cfafef2e195616cb8ee52093 (diff) | |
| download | Qt-dcc5c7ea047513ceb6fc75aac526b17ad6629d4c.zip Qt-dcc5c7ea047513ceb6fc75aac526b17ad6629d4c.tar.gz Qt-dcc5c7ea047513ceb6fc75aac526b17ad6629d4c.tar.bz2 | |
Replace all occurances of "Qt 4.7" with "QtQuick 1.0"
Task-number: QTBUG-13799
Reviewed-by: Martin Jones
(cherry picked from commit 49452ad6b22e080b1dfdfde38c21c48bb910a1ae)
Conflicts:
tests/auto/declarative/qdeclarativeconnection/data/error-object.qml
tests/auto/declarative/qdeclarativeconnection/data/error-property.qml
tests/auto/declarative/qdeclarativeconnection/data/error-property2.qml
tests/auto/declarative/qdeclarativeconnection/data/error-syntax.qml
tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
tests/auto/declarative/qdeclarativeqt/data/quit.qml
tests/auto/declarative/qdeclarativeview/data/error1.qml
Diffstat (limited to 'src/declarative/qml/qdeclarativedom.cpp')
| -rw-r--r-- | src/declarative/qml/qdeclarativedom.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativedom.cpp b/src/declarative/qml/qdeclarativedom.cpp index 1a9b501..fa79425 100644 --- a/src/declarative/qml/qdeclarativedom.cpp +++ b/src/declarative/qml/qdeclarativedom.cpp @@ -896,7 +896,7 @@ QByteArray QDeclarativeDomObject::customTypeData() const */ bool QDeclarativeDomObject::isComponent() const { - return (d->object && d->object->typeName == "Qt/Component"); + return (d->object && (d->object->typeName == "Qt/Component" || d->object->typeName == "QtQuick/Component")); } /*! |