diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2011-08-23 11:41:50 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-30 13:18:28 +0200 |
| commit | ee84bb67a2f90038d1f3462cb9141dffbfa9517b (patch) | |
| tree | 18d1f857ba6e8e89d670cec1f8218b8d14e1c71d /src/declarative/qml/qdeclarativeimport_p.h | |
| parent | c7a9493730b93f0e19705bdb02729e15b9955117 (diff) | |
Move all QML file parsing into the QDeclarativeScript namespace
Change-Id: I5969686a796cbfb2eeb3729014df7f01e51b0620
Reviewed-on: http://codereview.qt.nokia.com/3797
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Diffstat (limited to 'src/declarative/qml/qdeclarativeimport_p.h')
| -rw-r--r-- | src/declarative/qml/qdeclarativeimport_p.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/declarative/qml/qdeclarativeimport_p.h b/src/declarative/qml/qdeclarativeimport_p.h index 4f3b9c2a2d..c695a6b423 100644 --- a/src/declarative/qml/qdeclarativeimport_p.h +++ b/src/declarative/qml/qdeclarativeimport_p.h @@ -45,8 +45,9 @@ #include <QtCore/qurl.h> #include <QtCore/qcoreapplication.h> #include <QtCore/qset.h> +#include <QtCore/qstringlist.h> #include <private/qdeclarativedirparser_p.h> -#include <private/qdeclarativescriptparser_p.h> +#include <private/qdeclarativescript_p.h> #include <private/qdeclarativemetatype_p.h> // @@ -93,7 +94,7 @@ public: bool addImport(QDeclarativeImportDatabase *, const QString& uri, const QString& prefix, int vmaj, int vmin, - QDeclarativeScriptParser::Import::Type importType, + QDeclarativeScript::Import::Type importType, const QDeclarativeDirComponents &qmldircomponentsnetwork, QList<QDeclarativeError> *errors); |