diff options
| author | Kai Koehne <kai.koehne@nokia.com> | 2009-08-25 06:18:02 (GMT) |
|---|---|---|
| committer | Kai Koehne <kai.koehne@nokia.com> | 2009-08-25 06:18:02 (GMT) |
| commit | ab4269502cda34abef9fb52161405bd1f6172791 (patch) | |
| tree | 764717934171fec0f1c49f45e9449e0d34d6ba7b /src/declarative/qml/qmlengine_p.h | |
| parent | d4c67f5293c0a6c7d7b586a401e1972b964d0c16 (diff) | |
| parent | 8d5bd63dcbfc610128166f6d277680c9385aa665 (diff) | |
| download | Qt-ab4269502cda34abef9fb52161405bd1f6172791.zip Qt-ab4269502cda34abef9fb52161405bd1f6172791.tar.gz Qt-ab4269502cda34abef9fb52161405bd1f6172791.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/qml/qmlengine_p.h')
| -rw-r--r-- | src/declarative/qml/qmlengine_p.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/declarative/qml/qmlengine_p.h b/src/declarative/qml/qmlengine_p.h index c84b3b5..18e3765 100644 --- a/src/declarative/qml/qmlengine_p.h +++ b/src/declarative/qml/qmlengine_p.h @@ -209,10 +209,14 @@ public: 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, ImportedNamespace** ns_return=0) const; - - void resolveNamespace(const Imports& imports, const QByteArray &type, ImportedNamespace **s, QByteArray *unqualifiedType) const; - bool resolveTypeInNamespace(ImportedNamespace*, const QByteArray& type, QmlType** type_return, QUrl* url_return ) const; + bool resolveType(const Imports&, const QByteArray& type, + QmlType** type_return, QUrl* url_return, + ImportedNamespace** ns_return=0) const; + void resolveNamespace(const Imports& imports, const QByteArray &type, + ImportedNamespace **s, + QByteArray *unqualifiedType) const; + bool resolveTypeInNamespace(ImportedNamespace*, const QByteArray& type, + QmlType** type_return, QUrl* url_return ) const; static QScriptValue qmlScriptObject(QObject*, QmlEngine*); |