1 files changed, 8 insertions, 6 deletions
diff --git a/src/qml/qml/qqmlscript_p.h b/src/qml/qml/qqmlscript_p.h
index 8705f2aef9..1e46e6b655 100644
--- a/src/qml/qml/qqmlscript_p.h
+++ b/src/qml/qml/qqmlscript_p.h
@@ -109,16 +109,16 @@ struct LocationSpan
 class Import
 {
 public:
-    Import() : type(Library) {}
+    Import() : type(Library), majorVersion(-1), minorVersion(-1) {}
 
     enum Type { Library, File, Script };
     Type type;
 
     QString uri;
     QString qualifier;
-    QString version;
 
-    void extractVersion(int *maj, int *min) const;
+    int majorVersion;
+    int minorVersion;
 
     QQmlScript::LocationSpan location;
 };
@@ -469,14 +469,16 @@ public:
 };
 
 class ParserJsASTData;
-class Q_AUTOTEST_EXPORT Parser
+class Q_QML_EXPORT Parser
 {
 public:
     Parser();
     ~Parser();
 
-    bool parse(const QByteArray &data, const QUrl &url = QUrl(),
-               const QString &urlString = QString());
+    bool parse(const QString &data, const QByteArray &preparseData,
+               const QUrl &url = QUrl(), const QString &urlString = QString());
+
+    QByteArray preparseData() const;
 
     QList<TypeReference*> referencedTypes() const;