1 files changed, 6 insertions, 9 deletions
diff --git a/src/qml/qml/qqmlcustomparser.cpp b/src/qml/qml/qqmlcustomparser.cpp
index 134002cf33..85c91a592a 100644
--- a/src/qml/qml/qqmlcustomparser.cpp
+++ b/src/qml/qml/qqmlcustomparser.cpp
@@ -39,7 +39,6 @@
 
 #include "qqmlcustomparser_p.h"
 
-#include "qqmlcompiler_p.h"
 #include <private/qqmltypecompiler_p.h>
 
 #include <QtCore/qdebug.h>
@@ -101,11 +100,7 @@ void QQmlCustomParser::clearErrors()
 */
 void QQmlCustomParser::error(const QV4::CompiledData::Location &location, const QString &description)
 {
-    QQmlError error;
-    error.setLine(location.line);
-    error.setColumn(location.column);
-    error.setDescription(description);
-    exceptions << error;
+    exceptions << QQmlCompileError(location, description);
 }
 
 struct StaticQtMetaObject : public QObject
@@ -166,11 +161,13 @@ int QQmlCustomParser::evaluateEnum(const QByteArray& script, bool *ok) const
 */
 const QMetaObject *QQmlCustomParser::resolveType(const QString& name) const
 {
+    if (!imports.isT1())
+        return nullptr;
     QQmlType *qmltype = 0;
-    if (!validator->imports().resolveType(name, &qmltype, 0, 0, 0))
-        return 0;
+    if (!imports.asT1()->resolveType(name, &qmltype, 0, 0, 0))
+        return nullptr;
     if (!qmltype)
-        return 0;
+        return nullptr;
     return qmltype->metaObject();
 }