diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-01 12:44:51 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-01 12:44:51 +0200 |
commit | b78372c4ba31da2d941d70ba23a927deae7d830c (patch) | |
tree | 25d9eeefbbb4c6ace084c56e58ac7bd1927217b5 /src/qml/compiler/qv4codegen_p.h | |
parent | 9990c0f577f6a6a67ccebffb56ad1afc7a98ed1d (diff) | |
parent | 7ea1f75fd877f312d70a90ab0405f3ca03914171 (diff) |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I996a85744753598bb48c7e0d7954049202f4f037
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 cb87846a3b..0d52fb83fa 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 } |