diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-03-22 23:26:17 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-03-22 23:26:17 (GMT) |
| commit | 190b2667b54eff4540e6b204d0cda39847417a52 (patch) | |
| tree | 70e85a7e650c4ac3e8f8dae9bd9c4bf32fd355b3 /src/declarative/qml/qdeclarativeengine_p.h | |
| parent | 2b098cd37d86bc7c843225412c90948affb8fef1 (diff) | |
| download | Qt-190b2667b54eff4540e6b204d0cda39847417a52.zip Qt-190b2667b54eff4540e6b204d0cda39847417a52.tar.gz Qt-190b2667b54eff4540e6b204d0cda39847417a52.tar.bz2 | |
Manual merge.
Diffstat (limited to 'src/declarative/qml/qdeclarativeengine_p.h')
| -rw-r--r-- | src/declarative/qml/qdeclarativeengine_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativeengine_p.h b/src/declarative/qml/qdeclarativeengine_p.h index 6532d30..06b5027 100644 --- a/src/declarative/qml/qdeclarativeengine_p.h +++ b/src/declarative/qml/qdeclarativeengine_p.h @@ -283,7 +283,8 @@ public: bool addToImport(Imports*, const QDeclarativeDirComponents &qmldircomponentsnetwork, const QString& uri, const QString& prefix, int vmaj, int vmin, - QDeclarativeScriptParser::Import::Type importType) const; + QDeclarativeScriptParser::Import::Type importType, + QString *errorString) const; bool resolveType(const Imports&, const QByteArray& type, QDeclarativeType** type_return, QUrl* url_return, int *version_major, int *version_minor, |