1 files changed, 4 insertions, 6 deletions

diff --git a/tools/qmlcachegen/qmlcachegen.cpp b/tools/qmlcachegen/qmlcachegen.cpp
index 8a2776e808..b9a8763c97 100644
--- a/tools/qmlcachegen/qmlcachegen.cpp
+++ b/tools/qmlcachegen/qmlcachegen.cpp
@@ -37,6 +37,7 @@
 
 #include <private/qqmlirbuilder_p.h>
 #include <private/qqmljsparser_p.h>
+#include <private/qqmljslexer_p.h>
 
 #include "resourcefilemapper.h"
 
@@ -236,7 +237,7 @@ static bool compileQmlFile(const QString &inputFileName, SaveFunction saveFuncti
         unit->flags |= QV4::CompiledData::Unit::PendingTypeCompilation;
         irDocument.javaScriptCompilationUnit->data = unit;
 
-        if (!saveFunction(irDocument.javaScriptCompilationUnit, &error->message))
+        if (!saveFunction(irDocument.javaScriptCompilationUnit.data(), &error->message))
             return false;
 
         free(unit);
@@ -304,7 +305,7 @@ static bool compileJSFile(const QString &inputFileName, const QString &inputFile
                                    &irDocument.jsGenerator.stringTable, illegalNames);
         v4CodeGen.setUseFastLookups(false); // Disable lookups in non-standalone (aka QML) mode
         v4CodeGen.generateFromProgram(inputFileName, inputFileUrl, sourceCode, program,
-                                      &irDocument.jsModule, QV4::Compiler::GlobalCode);
+                                      &irDocument.jsModule, QV4::Compiler::ContextType::Global);
         QList<QQmlJS::DiagnosticMessage> jsErrors = v4CodeGen.errors();
         if (!jsErrors.isEmpty()) {
             for (const QQmlJS::DiagnosticMessage &e: qAsConst(jsErrors)) {
@@ -323,7 +324,7 @@ static bool compileJSFile(const QString &inputFileName, const QString &inputFile
         unit->flags |= QV4::CompiledData::Unit::StaticData;
         irDocument.javaScriptCompilationUnit->data = unit;
 
-        if (!saveFunction(irDocument.javaScriptCompilationUnit, &error->message)) {
+        if (!saveFunction(irDocument.javaScriptCompilationUnit.data(), &error->message)) {
             engine->setDirectives(oldDirs);
             return false;
         }
@@ -434,9 +435,6 @@ int main(int argc, char **argv)
     QCommandLineOption outputFileOption(QStringLiteral("o"), QCoreApplication::translate("main", "Output file name"), QCoreApplication::translate("main", "file name"));
     parser.addOption(outputFileOption);
 
-    QCommandLineOption checkIfSupportedOption(QStringLiteral("check-if-supported"), QCoreApplication::translate("main", "Check if cache generate is supported on the specified target architecture"));
-    parser.addOption(checkIfSupportedOption);
-
     parser.addPositionalArgument(QStringLiteral("[qml file]"),
             QStringLiteral("QML source file to generate cache for."));