diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-26 01:00:06 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-26 01:00:06 +0100 |
commit | fbd86c6a24ee4999d724f9aaccf1941d02538187 (patch) | |
tree | ce734921c9804eff76498b77e24742c71b1aafff /tools/qmlcachegen/qmlcachegen.cpp | |
parent | a8cc4f2b51722380a30fae0009205db917feb7a9 (diff) | |
parent | 0dab320fb42ba2ac855baf05972c3420c11d002e (diff) |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: Iaaf9749a812c21c065ded0374ce0aa07de7752cf
Diffstat (limited to 'tools/qmlcachegen/qmlcachegen.cpp')
-rw-r--r-- | tools/qmlcachegen/qmlcachegen.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/tools/qmlcachegen/qmlcachegen.cpp b/tools/qmlcachegen/qmlcachegen.cpp index f6f1d99526..1c9a004cb3 100644 --- a/tools/qmlcachegen/qmlcachegen.cpp +++ b/tools/qmlcachegen/qmlcachegen.cpp @@ -204,7 +204,6 @@ static bool compileQmlFile(const QString &inputFileName, SaveFunction saveFuncti &irDocument.jsGenerator, &irDocument.jsModule, &irDocument.jsParserEngine, irDocument.program, &irDocument.jsGenerator.stringTable, illegalNames); - v4CodeGen.setUseFastLookups(false); // Disable lookups in non-standalone (aka QML) mode for (QmlIR::Object *object: qAsConst(irDocument.objects)) { if (object->functionsAndExpressions->count == 0) continue; @@ -236,8 +235,6 @@ static bool compileQmlFile(const QString &inputFileName, SaveFunction saveFuncti if (!saveFunction(irDocument.javaScriptCompilationUnit, &error->message)) return false; - - free(unit); } return true; } @@ -245,7 +242,6 @@ 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; - QScopedPointer<QV4::CompiledData::Unit, QScopedPointerPodDeleter> unitDataToFree; QString sourceCode; { @@ -327,7 +323,6 @@ static bool compileJSFile(const QString &inputFileName, const QString &inputFile generator.generate(irDocument); QV4::CompiledData::Unit *unitData = const_cast<QV4::CompiledData::Unit*>(irDocument.javaScriptCompilationUnit->data); unitData->flags |= QV4::CompiledData::Unit::StaticData; - unitDataToFree.reset(unitData); unit = irDocument.javaScriptCompilationUnit; } } |