diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-03-12 16:55:06 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-23 21:16:46 +0200 |
| commit | a885d10a0289da85b8c966d2fa40fb10edae4fd7 (patch) | |
| tree | 7c16b5abd88d436f6596d6a424126c1b1dd2aba8 /src/qml/compiler/qv4codegen_p.h | |
| parent | 937fdde5d3b26291d417f856ee05ba479a6ba730 (diff) | |
Extend the QML bootstrap library by the IR builders
This is among other things needed to fix the qml import scanner to detect
dependencies from .js files correctly.
The patch also fixes the use of Q_QML_EXPORT towards Q_QML_PRIVATE_EXPORT
where appropriate and corrects the wrong include path for the double conversion
code to actually be relative to the file it is included from. This worked by
accident because of other include paths present in the build.
Change-Id: I338583dad2f76300819af8ab0dae8e5724c84430
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/compiler/qv4codegen_p.h')
| -rw-r--r-- | src/qml/compiler/qv4codegen_p.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/qml/compiler/qv4codegen_p.h b/src/qml/compiler/qv4codegen_p.h index c495437622..fafcfdd04e 100644 --- a/src/qml/compiler/qv4codegen_p.h +++ b/src/qml/compiler/qv4codegen_p.h @@ -45,9 +45,12 @@ #include "qv4jsir_p.h" #include <private/qqmljsastvisitor_p.h> #include <private/qqmljsast_p.h> +#include <private/qqmljsengine_p.h> #include <QtCore/QStringList> #include <QStack> +#ifndef V4_BOOTSTRAP #include <qqmlerror.h> +#endif #include <private/qv4util_p.h> QT_BEGIN_NAMESPACE @@ -62,7 +65,7 @@ class UiParameterList; } -class Q_QML_EXPORT Codegen: protected AST::Visitor +class Q_QML_PRIVATE_EXPORT Codegen: protected AST::Visitor { public: Codegen(bool strict); @@ -434,7 +437,10 @@ protected: virtual void throwReferenceError(const AST::SourceLocation &loc, const QString &detail); public: - QList<QQmlError> errors() const; + QList<DiagnosticMessage> errors() const; +#ifndef V4_BOOTSTRAP + QList<QQmlError> qmlErrors() const; +#endif protected: Result _expr; @@ -456,7 +462,7 @@ protected: bool _fileNameIsUrl; bool hasError; - QList<QQmlError> _errors; + QList<QQmlJS::DiagnosticMessage> _errors; class ScanFunctions: protected Visitor { @@ -532,6 +538,7 @@ protected: }; +#ifndef V4_BOOTSTRAP class RuntimeCodegen : public Codegen { public: @@ -545,6 +552,7 @@ public: private: QV4::ExecutionContext *context; }; +#endif // V4_BOOTSTRAP } |