diff options
author | Warwick Allison <warwick.allison@nokia.com> | 2009-08-25 07:25:43 (GMT) |
---|---|---|
committer | Warwick Allison <warwick.allison@nokia.com> | 2009-08-25 07:27:02 (GMT) |
commit | 912b9329a4d52e0260683b714976b166d1f56779 (patch) | |
tree | 47bb0252a0e4cdd5b1e40fc0d72ab962d33f0ec8 /src/declarative/qml/qmlengine_p.h | |
parent | 7c1eaa4ec5d78ccf7770c09e12afb497daa4b90e (diff) | |
parent | ab4269502cda34abef9fb52161405bd1f6172791 (diff) | |
download | Qt-912b9329a4d52e0260683b714976b166d1f56779.zip Qt-912b9329a4d52e0260683b714976b166d1f56779.tar.gz Qt-912b9329a4d52e0260683b714976b166d1f56779.tar.bz2 |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/qml/qmlcompiler.cpp
src/declarative/qml/qmlengine_p.h
Diffstat (limited to 'src/declarative/qml/qmlengine_p.h')
-rw-r--r-- | src/declarative/qml/qmlengine_p.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/declarative/qml/qmlengine_p.h b/src/declarative/qml/qmlengine_p.h index 3f0c03c..53b2967 100644 --- a/src/declarative/qml/qmlengine_p.h +++ b/src/declarative/qml/qmlengine_p.h @@ -201,8 +201,13 @@ public: struct ImportedNamespace; bool addToImport(Imports*, const QString& uri, const QString& prefix, int vmaj, int vmin, QmlScriptParser::Import::Type importType) const; - bool resolveType(const Imports&, const QByteArray& type, QmlType** type_return, QUrl* url_return, int *version_major, int *version_minor, ImportedNamespace** ns_return=0) const; - void resolveTypeInNamespace(ImportedNamespace*, const QByteArray& type, QmlType** type_return, QUrl* url_return, int *version_major, int *version_minor ) const; + bool resolveType(const Imports&, const QByteArray& type, + QmlType** type_return, QUrl* url_return, + int *version_major, int *version_minor, + ImportedNamespace** ns_return) const; + void resolveTypeInNamespace(ImportedNamespace*, const QByteArray& type, + QmlType** type_return, QUrl* url_return, + int *version_major, int *version_minor ) const; static QScriptValue qmlScriptObject(QObject*, QmlEngine*); |