1 files changed, 13 insertions, 6 deletions
diff --git a/src/qml/compiler/qv4codegen_p.h b/src/qml/compiler/qv4codegen_p.h
index 9c43dc17fe..0d52fb83fa 100644
--- a/src/qml/compiler/qv4codegen_p.h
+++ b/src/qml/compiler/qv4codegen_p.h
@@ -45,10 +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>
-#include <assert.h>
+#endif
 #include <private/qv4util_p.h>
 
 QT_BEGIN_NAMESPACE
@@ -63,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);
@@ -180,7 +182,7 @@ protected:
             MemberMap::const_iterator it = members.find(name);
             if (it == members.end())
                 return -1;
-            assert((*it).index != -1 || !parent);
+            Q_ASSERT((*it).index != -1 || !parent);
             return (*it).index;
         }
 
@@ -284,7 +286,7 @@ protected:
     }
     void pushExceptionHandler(QV4::IR::BasicBlock *handler)
     {
-        handler->isExceptionHandler = true;
+        handler->setExceptionHandler(true);
         _exceptionHandlers.push(handler);
     }
     void popExceptionHandler()
@@ -435,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;
@@ -457,7 +462,7 @@ protected:
 
     bool _fileNameIsUrl;
     bool hasError;
-    QList<QQmlError> _errors;
+    QList<QQmlJS::DiagnosticMessage> _errors;
 
     class ScanFunctions: protected Visitor
     {
@@ -533,6 +538,7 @@ protected:
 
 };
 
+#ifndef V4_BOOTSTRAP
 class RuntimeCodegen : public Codegen
 {
 public:
@@ -546,6 +552,7 @@ public:
 private:
     QV4::ExecutionContext *context;
 };
+#endif // V4_BOOTSTRAP
 
 }