diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-08-25 02:42:59 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-08-25 02:42:59 (GMT) |
| commit | de9bcc414c230fa7af1828d938c59fe2d139b968 (patch) | |
| tree | 5f8a3ace3a940eb9f7f5be0f61ebb25d6a91268c /src | |
| parent | 8823016dac5f0db41970926fada6db2b5f213e93 (diff) | |
| download | Qt-de9bcc414c230fa7af1828d938c59fe2d139b968.zip Qt-de9bcc414c230fa7af1828d938c59fe2d139b968.tar.gz Qt-de9bcc414c230fa7af1828d938c59fe2d139b968.tar.bz2 | |
Revert cb81a637c8ef041cff2e96c6065763084776d75a
Programming error to call with ns==0.
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/qml/qmlengine.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp index b3e08ea..faac8cd 100644 --- a/src/declarative/qml/qmlengine.cpp +++ b/src/declarative/qml/qmlengine.cpp @@ -1362,9 +1362,6 @@ bool QmlEnginePrivate::resolveType(const Imports& imports, const QByteArray& typ */ void QmlEnginePrivate::resolveTypeInNamespace(ImportedNamespace* ns, const QByteArray& type, QmlType** type_return, QUrl* url_return, int *vmaj, int *vmin ) const { - if (!ns) - return; - if (type_return) { *type_return = ns->findBuiltin(type,vmaj,vmin); } |