1 files changed, 17 insertions, 13 deletions

diff --git a/tools/qmlcachegen/qmlcachegen.cpp b/tools/qmlcachegen/qmlcachegen.cpp
index bf0bcaf04e..63be5c5ec4 100644
--- a/tools/qmlcachegen/qmlcachegen.cpp
+++ b/tools/qmlcachegen/qmlcachegen.cpp
@@ -169,7 +169,7 @@ static bool checkArgumentsObjectUseInSignalHandlers(const QmlIR::Document &doc,
     return true;
 }
 
-using SaveFunction = std::function<bool (const QQmlRefPointer<QV4::CompiledData::CompilationUnit> &, QString *)>;
+using SaveFunction = std::function<bool (const QV4::CompiledData::CompilationUnit &, QString *)>;
 
 static bool compileQmlFile(const QString &inputFileName, SaveFunction saveFunction, Error *error)
 {
@@ -229,7 +229,7 @@ static bool compileQmlFile(const QString &inputFileName, SaveFunction saveFuncti
         QmlIR::QmlUnitGenerator generator;
         irDocument.javaScriptCompilationUnit = v4CodeGen.generateCompilationUnit(/*generate unit*/false);
         generator.generate(irDocument);
-        QV4::CompiledData::Unit *unit = const_cast<QV4::CompiledData::Unit*>(irDocument.javaScriptCompilationUnit->data);
+        QV4::CompiledData::Unit *unit = const_cast<QV4::CompiledData::Unit*>(irDocument.javaScriptCompilationUnit.data);
         unit->flags |= QV4::CompiledData::Unit::StaticData;
         unit->flags |= QV4::CompiledData::Unit::PendingTypeCompilation;
 
@@ -241,7 +241,7 @@ static bool compileQmlFile(const QString &inputFileName, SaveFunction saveFuncti
 
 static bool compileJSFile(const QString &inputFileName, const QString &inputFileUrl, SaveFunction saveFunction, Error *error)
 {
-    QQmlRefPointer<QV4::CompiledData::CompilationUnit> unit;
+    QV4::CompiledData::CompilationUnit unit;
 
     QString sourceCode;
     {
@@ -265,7 +265,7 @@ static bool compileJSFile(const QString &inputFileName, const QString &inputFile
         unit = QV4::Compiler::Codegen::compileModule(/*debugMode*/false, url, sourceCode,
                                                      QDateTime(), &diagnostics);
         error->appendDiagnostics(inputFileName, diagnostics);
-        if (!unit)
+        if (!unit.unitData())
             return false;
     } else {
         QmlIR::Document irDocument(/*debugMode*/false);
@@ -321,9 +321,9 @@ static bool compileJSFile(const QString &inputFileName, const QString &inputFile
             irDocument.javaScriptCompilationUnit = v4CodeGen.generateCompilationUnit(/*generate unit*/false);
             QmlIR::QmlUnitGenerator generator;
             generator.generate(irDocument);
-            QV4::CompiledData::Unit *unitData = const_cast<QV4::CompiledData::Unit*>(irDocument.javaScriptCompilationUnit->data);
+            QV4::CompiledData::Unit *unitData = const_cast<QV4::CompiledData::Unit*>(irDocument.javaScriptCompilationUnit.data);
             unitData->flags |= QV4::CompiledData::Unit::StaticData;
-            unit = irDocument.javaScriptCompilationUnit;
+            unit = std::move(irDocument.javaScriptCompilationUnit);
         }
     }
 
@@ -331,7 +331,8 @@ static bool compileJSFile(const QString &inputFileName, const QString &inputFile
 }
 
 static bool saveUnitAsCpp(const QString &inputFileName, const QString &outputFileName,
-                          const QQmlRefPointer<QV4::CompiledData::CompilationUnit> &unit, QString *errorString)
+                          const QV4::CompiledData::CompilationUnit &unit,
+                          QString *errorString)
 {
     QSaveFile f(outputFileName);
     if (!f.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
@@ -368,8 +369,8 @@ static bool saveUnitAsCpp(const QString &inputFileName, const QString &outputFil
     QByteArray hexifiedData;
     {
         QByteArray modifiedUnit;
-        modifiedUnit.resize(unit->data->unitSize);
-        memcpy(modifiedUnit.data(), unit->data, unit->data->unitSize);
+        modifiedUnit.resize(unit.data->unitSize);
+        memcpy(modifiedUnit.data(), unit.data, unit.data->unitSize);
         const char *dataPtr = modifiedUnit.data();
         QV4::CompiledData::Unit *unitPtr;
         memcpy(&unitPtr, &dataPtr, sizeof(unitPtr));
@@ -377,7 +378,7 @@ static bool saveUnitAsCpp(const QString &inputFileName, const QString &outputFil
 
         QTextStream stream(&hexifiedData);
         const uchar *begin = reinterpret_cast<const uchar *>(modifiedUnit.constData());
-        const uchar *end = begin + unit->data->unitSize;
+        const uchar *end = begin + unit.data->unitSize;
         stream << hex;
         int col = 0;
         for (const uchar *data = begin; data < end; ++data, ++col) {
@@ -525,13 +526,16 @@ int main(int argc, char **argv)
 
         inputFileUrl = QStringLiteral("qrc://") + inputResourcePath;
 
-        saveFunction = [inputResourcePath, outputFileName](const QQmlRefPointer<QV4::CompiledData::CompilationUnit> &unit, QString *errorString) {
+        saveFunction = [inputResourcePath, outputFileName](
+                               const QV4::CompiledData::CompilationUnit &unit,
+                               QString *errorString) {
             return saveUnitAsCpp(inputResourcePath, outputFileName, unit, errorString);
         };
 
     } else {
-        saveFunction = [outputFileName](const QQmlRefPointer<QV4::CompiledData::CompilationUnit> &unit, QString *errorString) {
-            return unit->saveToDisk(outputFileName, errorString);
+        saveFunction = [outputFileName](const QV4::CompiledData::CompilationUnit &unit,
+                                        QString *errorString) {
+            return unit.saveToDisk(outputFileName, errorString);
         };
     }