diff options
Diffstat (limited to 'src/qml')
-rw-r--r-- | src/qml/compiler/compiler.pri | 31 | ||||
-rw-r--r-- | src/qml/compiler/qv4alloca_p.h (renamed from src/qml/jsruntime/qv4alloca_p.h) | 0 | ||||
-rw-r--r-- | src/qml/compiler/qv4calldata_p.h (renamed from src/qml/jsruntime/qv4calldata_p.h) | 0 | ||||
-rw-r--r-- | src/qml/compiler/qv4compiler.cpp | 29 | ||||
-rw-r--r-- | src/qml/compiler/qv4staticvalue_p.h (renamed from src/qml/jsruntime/qv4staticvalue_p.h) | 0 | ||||
-rw-r--r-- | src/qml/compiler/qv4stringtoarrayindex_p.h (renamed from src/qml/jsruntime/qv4stringtoarrayindex_p.h) | 0 | ||||
-rw-r--r-- | src/qml/compiler/qv4util_p.h (renamed from src/qml/jsruntime/qv4util_p.h) | 1 | ||||
-rw-r--r-- | src/qml/jsruntime/jsruntime.pri | 33 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4compilationunitmapper.cpp (renamed from src/qml/compiler/qv4compilationunitmapper.cpp) | 0 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4compilationunitmapper_p.h (renamed from src/qml/compiler/qv4compilationunitmapper_p.h) | 0 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4compilationunitmapper_unix.cpp (renamed from src/qml/compiler/qv4compilationunitmapper_unix.cpp) | 0 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4compilationunitmapper_win.cpp (renamed from src/qml/compiler/qv4compilationunitmapper_win.cpp) | 0 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4executablecompilationunit.cpp (renamed from src/qml/compiler/qv4executablecompilationunit.cpp) | 0 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4executablecompilationunit_p.h (renamed from src/qml/compiler/qv4executablecompilationunit_p.h) | 0 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4string_p.h | 2 | ||||
-rw-r--r-- | src/qml/memory/memory.pri | 6 | ||||
-rw-r--r-- | src/qml/qml/qml.pri | 14 | ||||
-rw-r--r-- | src/qml/qml/qqmlirloader.cpp (renamed from src/qml/compiler/qqmlirloader.cpp) | 0 | ||||
-rw-r--r-- | src/qml/qml/qqmlirloader_p.h (renamed from src/qml/compiler/qqmlirloader_p.h) | 0 | ||||
-rw-r--r-- | src/qml/qml/qqmlpropertycachecreator.cpp (renamed from src/qml/compiler/qqmlpropertycachecreator.cpp) | 0 | ||||
-rw-r--r-- | src/qml/qml/qqmlpropertycachecreator_p.h (renamed from src/qml/compiler/qqmlpropertycachecreator_p.h) | 0 | ||||
-rw-r--r-- | src/qml/qml/qqmlpropertyresolver.cpp (renamed from src/qml/compiler/qqmlpropertyresolver.cpp) | 0 | ||||
-rw-r--r-- | src/qml/qml/qqmlpropertyresolver_p.h (renamed from src/qml/compiler/qqmlpropertyresolver_p.h) | 0 | ||||
-rw-r--r-- | src/qml/qml/qqmlpropertyvalidator.cpp (renamed from src/qml/compiler/qqmlpropertyvalidator.cpp) | 0 | ||||
-rw-r--r-- | src/qml/qml/qqmlpropertyvalidator_p.h (renamed from src/qml/compiler/qqmlpropertyvalidator_p.h) | 0 | ||||
-rw-r--r-- | src/qml/qml/qqmltypecompiler.cpp (renamed from src/qml/compiler/qqmltypecompiler.cpp) | 0 | ||||
-rw-r--r-- | src/qml/qml/qqmltypecompiler_p.h (renamed from src/qml/compiler/qqmltypecompiler_p.h) | 0 |
27 files changed, 50 insertions, 66 deletions
diff --git a/src/qml/compiler/compiler.pri b/src/qml/compiler/compiler.pri index 3291d6e1f5..c3dd5890d6 100644 --- a/src/qml/compiler/compiler.pri +++ b/src/qml/compiler/compiler.pri @@ -2,6 +2,7 @@ INCLUDEPATH += $$PWD INCLUDEPATH += $$OUT_PWD HEADERS += \ + $$PWD/qv4alloca_p.h \ $$PWD/qv4bytecodegenerator_p.h \ $$PWD/qv4compileddata_p.h \ $$PWD/qv4compiler_p.h \ @@ -11,7 +12,11 @@ HEADERS += \ $$PWD/qv4codegen_p.h \ $$PWD/qqmlirbuilder_p.h \ $$PWD/qv4instr_moth_p.h \ - $$PWD/qv4bytecodehandler_p.h + $$PWD/qv4bytecodehandler_p.h \ + $$PWD/qv4calldata_p.h \ + $$PWD/qv4util_p.h \ + $$PWD/qv4staticvalue_p.h \ + $$PWD/qv4stringtoarrayindex_p.h SOURCES += \ $$PWD/qv4bytecodegenerator.cpp \ @@ -24,30 +29,6 @@ SOURCES += \ $$PWD/qv4instr_moth.cpp \ $$PWD/qv4bytecodehandler.cpp -!qmldevtools_build { - -HEADERS += \ - $$PWD/qqmlirloader_p.h \ - $$PWD/qqmlpropertyresolver_p.h \ - $$PWD/qqmltypecompiler_p.h \ - $$PWD/qqmlpropertycachecreator_p.h \ - $$PWD/qqmlpropertyvalidator_p.h \ - $$PWD/qv4compilationunitmapper_p.h \ - $$PWD/qv4executablecompilationunit_p.h - -SOURCES += \ - $$PWD/qqmlirloader.cpp \ - $$PWD/qqmlpropertyresolver.cpp \ - $$PWD/qqmltypecompiler.cpp \ - $$PWD/qqmlpropertycachecreator.cpp \ - $$PWD/qqmlpropertyvalidator.cpp \ - $$PWD/qv4compilationunitmapper.cpp \ - $$PWD/qv4executablecompilationunit.cpp - -unix: SOURCES += $$PWD/qv4compilationunitmapper_unix.cpp -else: SOURCES += $$PWD/qv4compilationunitmapper_win.cpp -} - gcc { equals(QT_GCC_MAJOR_VERSION, 5): QMAKE_CXXFLAGS += -fno-strict-aliasing } diff --git a/src/qml/jsruntime/qv4alloca_p.h b/src/qml/compiler/qv4alloca_p.h index 65c3e4d65a..65c3e4d65a 100644 --- a/src/qml/jsruntime/qv4alloca_p.h +++ b/src/qml/compiler/qv4alloca_p.h diff --git a/src/qml/jsruntime/qv4calldata_p.h b/src/qml/compiler/qv4calldata_p.h index 5a5280cb86..5a5280cb86 100644 --- a/src/qml/jsruntime/qv4calldata_p.h +++ b/src/qml/compiler/qv4calldata_p.h diff --git a/src/qml/compiler/qv4compiler.cpp b/src/qml/compiler/qv4compiler.cpp index 8722263b04..d8f293211e 100644 --- a/src/qml/compiler/qv4compiler.cpp +++ b/src/qml/compiler/qv4compiler.cpp @@ -44,9 +44,16 @@ #include <private/qv4alloca_p.h> #include <private/qqmljslexer_p.h> #include <private/qqmljsast_p.h> -#include <wtf/MathExtras.h> #include <QCryptographicHash> +// Efficient implementation that takes advantage of powers of two. +static inline size_t roundUpToMultipleOf(size_t divisor, size_t x) +{ + Q_ASSERT(divisor && !(divisor & (divisor - 1))); + const size_t remainderMask = divisor - 1; + return (x + remainderMask) & ~remainderMask; +} + QV4::Compiler::StringTableGenerator::StringTableGenerator() { clear(); @@ -91,7 +98,7 @@ void QV4::Compiler::StringTableGenerator::serialize(CompiledData::Unit *unit) { char *dataStart = reinterpret_cast<char *>(unit); quint32_le *stringTable = reinterpret_cast<quint32_le *>(dataStart + unit->offsetToStringTable); - char *stringData = reinterpret_cast<char *>(stringTable) + WTF::roundUpToMultipleOf(8, unit->stringTableSize * sizeof(uint)); + char *stringData = reinterpret_cast<char *>(stringTable) + roundUpToMultipleOf(8, unit->stringTableSize * sizeof(uint)); for (int i = backingUnitTableSize ; i < strings.size(); ++i) { const int index = i - backingUnitTableSize; stringTable[index] = stringData - dataStart; @@ -393,7 +400,7 @@ void QV4::Compiler::JSUnitGenerator::writeFunction(char *f, QV4::Compiler::Conte { QV4::CompiledData::Function *function = (QV4::CompiledData::Function *)f; - quint32 currentOffset = static_cast<quint32>(WTF::roundUpToMultipleOf(8, sizeof(*function))); + quint32 currentOffset = static_cast<quint32>(roundUpToMultipleOf(8, sizeof(*function))); function->nameIndex = getStringId(irFunction->name); function->flags = 0; @@ -543,7 +550,7 @@ void QV4::Compiler::JSUnitGenerator::writeBlock(char *b, QV4::Compiler::Context { QV4::CompiledData::Block *block = reinterpret_cast<QV4::CompiledData::Block *>(b); - quint32 currentOffset = static_cast<quint32>(WTF::roundUpToMultipleOf(8, sizeof(*block))); + quint32 currentOffset = static_cast<quint32>(roundUpToMultipleOf(8, sizeof(*block))); block->sizeOfLocalTemporalDeadZone = irBlock->sizeOfLocalTemporalDeadZone; block->nLocals = irBlock->locals.size(); @@ -606,7 +613,7 @@ QV4::CompiledData::Unit QV4::Compiler::JSUnitGenerator::generateHeader(QV4::Comp unit.constantTableSize = constants.size(); // Ensure we load constants from well-aligned addresses into for example SSE registers. - nextOffset = static_cast<quint32>(WTF::roundUpToMultipleOf(16, nextOffset)); + nextOffset = static_cast<quint32>(roundUpToMultipleOf(16, nextOffset)); unit.offsetToConstantTable = nextOffset; nextOffset += unit.constantTableSize * sizeof(ReturnedValue); @@ -617,19 +624,19 @@ QV4::CompiledData::Unit QV4::Compiler::JSUnitGenerator::generateHeader(QV4::Comp *jsClassDataOffset = nextOffset; nextOffset += jsClassData.size(); - nextOffset = static_cast<quint32>(WTF::roundUpToMultipleOf(8, nextOffset)); + nextOffset = static_cast<quint32>(roundUpToMultipleOf(8, nextOffset)); unit.translationTableSize = translations.count(); unit.offsetToTranslationTable = nextOffset; nextOffset += unit.translationTableSize * sizeof(CompiledData::TranslationData); - nextOffset = static_cast<quint32>(WTF::roundUpToMultipleOf(8, nextOffset)); + nextOffset = static_cast<quint32>(roundUpToMultipleOf(8, nextOffset)); const auto reserveExportTable = [&nextOffset](int count, quint32_le *tableSizePtr, quint32_le *offsetPtr) { *tableSizePtr = count; *offsetPtr = nextOffset; nextOffset += count * sizeof(CompiledData::ExportEntry); - nextOffset = static_cast<quint32>(WTF::roundUpToMultipleOf(8, nextOffset)); + nextOffset = static_cast<quint32>(roundUpToMultipleOf(8, nextOffset)); }; reserveExportTable(module->localExportEntries.count(), &unit.localExportEntryTableSize, &unit.offsetToLocalExportEntryTable); @@ -639,12 +646,12 @@ QV4::CompiledData::Unit QV4::Compiler::JSUnitGenerator::generateHeader(QV4::Comp unit.importEntryTableSize = module->importEntries.count(); unit.offsetToImportEntryTable = nextOffset; nextOffset += unit.importEntryTableSize * sizeof(CompiledData::ImportEntry); - nextOffset = static_cast<quint32>(WTF::roundUpToMultipleOf(8, nextOffset)); + nextOffset = static_cast<quint32>(roundUpToMultipleOf(8, nextOffset)); unit.moduleRequestTableSize = module->moduleRequests.count(); unit.offsetToModuleRequestTable = nextOffset; nextOffset += unit.moduleRequestTableSize * sizeof(uint); - nextOffset = static_cast<quint32>(WTF::roundUpToMultipleOf(8, nextOffset)); + nextOffset = static_cast<quint32>(roundUpToMultipleOf(8, nextOffset)); quint32 functionSize = 0; for (int i = 0; i < module->functions.size(); ++i) { @@ -684,7 +691,7 @@ QV4::CompiledData::Unit QV4::Compiler::JSUnitGenerator::generateHeader(QV4::Comp if (option == GenerateWithStringTable) { unit.stringTableSize = stringTable.stringCount(); - nextOffset = static_cast<quint32>(WTF::roundUpToMultipleOf(8, nextOffset)); + nextOffset = static_cast<quint32>(roundUpToMultipleOf(8, nextOffset)); unit.offsetToStringTable = nextOffset; nextOffset += stringTable.sizeOfTableAndData(); } else { diff --git a/src/qml/jsruntime/qv4staticvalue_p.h b/src/qml/compiler/qv4staticvalue_p.h index c6b4bdb158..c6b4bdb158 100644 --- a/src/qml/jsruntime/qv4staticvalue_p.h +++ b/src/qml/compiler/qv4staticvalue_p.h diff --git a/src/qml/jsruntime/qv4stringtoarrayindex_p.h b/src/qml/compiler/qv4stringtoarrayindex_p.h index 61bd988d1e..61bd988d1e 100644 --- a/src/qml/jsruntime/qv4stringtoarrayindex_p.h +++ b/src/qml/compiler/qv4stringtoarrayindex_p.h diff --git a/src/qml/jsruntime/qv4util_p.h b/src/qml/compiler/qv4util_p.h index 073832937d..bd9758c1fb 100644 --- a/src/qml/jsruntime/qv4util_p.h +++ b/src/qml/compiler/qv4util_p.h @@ -50,7 +50,6 @@ // We mean it. // -#include "qv4global_p.h" #include <QtCore/QBitArray> #include <algorithm> #include <vector> diff --git a/src/qml/jsruntime/jsruntime.pri b/src/qml/jsruntime/jsruntime.pri index 74e893e570..32acc6affc 100644 --- a/src/qml/jsruntime/jsruntime.pri +++ b/src/qml/jsruntime/jsruntime.pri @@ -1,7 +1,6 @@ INCLUDEPATH += $$PWD INCLUDEPATH += $$OUT_PWD -!qmldevtools_build { SOURCES += \ $$PWD/qv4engine.cpp \ $$PWD/qv4context.cpp \ @@ -60,13 +59,15 @@ SOURCES += \ $$PWD/qv4module.cpp \ $$PWD/qv4promiseobject.cpp \ $$PWD/qv4runtime.cpp \ - $$PWD/qv4value.cpp + $$PWD/qv4value.cpp \ + $$PWD/qv4compilationunitmapper.cpp \ + $$PWD/qv4executablecompilationunit.cpp \ + $$PWD/qv4executableallocator.cpp qtConfig(qml-debug): SOURCES += $$PWD/qv4profiling.cpp HEADERS += \ $$PWD/qv4global_p.h \ - $$PWD/qv4alloca_p.h \ $$PWD/qv4engine_p.h \ $$PWD/qv4enginebase_p.h \ $$PWD/qv4context_p.h \ @@ -133,7 +134,11 @@ HEADERS += \ $$PWD/qv4module_p.h \ $$PWD/qv4promiseobject_p.h \ $$PWD/qv4runtime_p.h \ - $$PWD/qv4value_p.h + $$PWD/qv4value_p.h \ + $$PWD/qv4compilationunitmapper_p.h \ + $$PWD/qv4executablecompilationunit_p.h \ + $$PWD/qv4functiontable_p.h \ + $$PWD/qv4runtimeapi_p.h qtConfig(qml-sequence-object) { HEADERS += \ @@ -143,24 +148,10 @@ qtConfig(qml-sequence-object) { $$PWD/qv4sequenceobject.cpp } -} - +unix: SOURCES += $$PWD/qv4compilationunitmapper_unix.cpp +else: SOURCES += $$PWD/qv4compilationunitmapper_win.cpp -HEADERS += \ - $$PWD/qv4calldata_p.h \ - $$PWD/qv4runtimeapi_p.h \ - $$PWD/qv4stringtoarrayindex_p.h \ - $$PWD/qv4util_p.h \ - $$PWD/qv4functiontable_p.h \ - $$PWD/qv4staticvalue_p.h - -SOURCES += \ - $$PWD/qv4executableallocator.cpp - -qmldevtools_build { - SOURCES += \ - $$PWD/qv4functiontable_noop.cpp -} else:win32 { +win32 { !winrt:equals(QT_ARCH, x86_64) { SOURCES += \ $$PWD/qv4functiontable_win64.cpp diff --git a/src/qml/compiler/qv4compilationunitmapper.cpp b/src/qml/jsruntime/qv4compilationunitmapper.cpp index 350f6f9485..350f6f9485 100644 --- a/src/qml/compiler/qv4compilationunitmapper.cpp +++ b/src/qml/jsruntime/qv4compilationunitmapper.cpp diff --git a/src/qml/compiler/qv4compilationunitmapper_p.h b/src/qml/jsruntime/qv4compilationunitmapper_p.h index 80f914c141..80f914c141 100644 --- a/src/qml/compiler/qv4compilationunitmapper_p.h +++ b/src/qml/jsruntime/qv4compilationunitmapper_p.h diff --git a/src/qml/compiler/qv4compilationunitmapper_unix.cpp b/src/qml/jsruntime/qv4compilationunitmapper_unix.cpp index 6768bc9596..6768bc9596 100644 --- a/src/qml/compiler/qv4compilationunitmapper_unix.cpp +++ b/src/qml/jsruntime/qv4compilationunitmapper_unix.cpp diff --git a/src/qml/compiler/qv4compilationunitmapper_win.cpp b/src/qml/jsruntime/qv4compilationunitmapper_win.cpp index 779c1288fe..779c1288fe 100644 --- a/src/qml/compiler/qv4compilationunitmapper_win.cpp +++ b/src/qml/jsruntime/qv4compilationunitmapper_win.cpp diff --git a/src/qml/compiler/qv4executablecompilationunit.cpp b/src/qml/jsruntime/qv4executablecompilationunit.cpp index c68f6a7cbf..c68f6a7cbf 100644 --- a/src/qml/compiler/qv4executablecompilationunit.cpp +++ b/src/qml/jsruntime/qv4executablecompilationunit.cpp diff --git a/src/qml/compiler/qv4executablecompilationunit_p.h b/src/qml/jsruntime/qv4executablecompilationunit_p.h index 4e3aadf28a..4e3aadf28a 100644 --- a/src/qml/compiler/qv4executablecompilationunit_p.h +++ b/src/qml/jsruntime/qv4executablecompilationunit_p.h diff --git a/src/qml/jsruntime/qv4string_p.h b/src/qml/jsruntime/qv4string_p.h index 7888809490..52fe09cd72 100644 --- a/src/qml/jsruntime/qv4string_p.h +++ b/src/qml/jsruntime/qv4string_p.h @@ -54,7 +54,7 @@ #include "qv4managed_p.h" #include <QtCore/private/qnumeric_p.h> #include "qv4enginebase_p.h" -#include "qv4stringtoarrayindex_p.h" +#include <private/qv4stringtoarrayindex_p.h> QT_BEGIN_NAMESPACE diff --git a/src/qml/memory/memory.pri b/src/qml/memory/memory.pri index 7956e4a9a1..0bc8e90d27 100644 --- a/src/qml/memory/memory.pri +++ b/src/qml/memory/memory.pri @@ -1,15 +1,11 @@ INCLUDEPATH += $$PWD INCLUDEPATH += $$OUT_PWD -!qmldevtools_build { SOURCES += \ $$PWD/qv4mm.cpp \ HEADERS += \ $$PWD/qv4mm_p.h \ $$PWD/qv4mmdefs_p.h \ - $$PWD/qv4writebarrier_p.h -} - -HEADERS += \ + $$PWD/qv4writebarrier_p.h \ $$PWD/qv4heap_p.h diff --git a/src/qml/qml/qml.pri b/src/qml/qml/qml.pri index 9f79bfacdf..c625743f61 100644 --- a/src/qml/qml/qml.pri +++ b/src/qml/qml/qml.pri @@ -52,7 +52,12 @@ SOURCES += \ $$PWD/qqmlfileselector.cpp \ $$PWD/qqmlobjectcreator.cpp \ $$PWD/qqmldelayedcallqueue.cpp \ - $$PWD/qqmlloggingcategory.cpp + $$PWD/qqmlloggingcategory.cpp \ + $$PWD/qqmlirloader.cpp \ + $$PWD/qqmlpropertyresolver.cpp \ + $$PWD/qqmltypecompiler.cpp \ + $$PWD/qqmlpropertycachecreator.cpp \ + $$PWD/qqmlpropertyvalidator.cpp HEADERS += \ $$PWD/qqmlglobal_p.h \ @@ -132,7 +137,12 @@ HEADERS += \ $$PWD/qqmlfileselector.h \ $$PWD/qqmlobjectcreator_p.h \ $$PWD/qqmldelayedcallqueue_p.h \ - $$PWD/qqmlloggingcategory_p.h + $$PWD/qqmlloggingcategory_p.h \ + $$PWD/qqmlirloader_p.h \ + $$PWD/qqmlpropertyresolver_p.h \ + $$PWD/qqmltypecompiler_p.h \ + $$PWD/qqmlpropertycachecreator_p.h \ + $$PWD/qqmlpropertyvalidator_p.h qtConfig(qml-xml-http-request) { HEADERS += \ diff --git a/src/qml/compiler/qqmlirloader.cpp b/src/qml/qml/qqmlirloader.cpp index c2eb6da2fa..c2eb6da2fa 100644 --- a/src/qml/compiler/qqmlirloader.cpp +++ b/src/qml/qml/qqmlirloader.cpp diff --git a/src/qml/compiler/qqmlirloader_p.h b/src/qml/qml/qqmlirloader_p.h index aa303c923f..aa303c923f 100644 --- a/src/qml/compiler/qqmlirloader_p.h +++ b/src/qml/qml/qqmlirloader_p.h diff --git a/src/qml/compiler/qqmlpropertycachecreator.cpp b/src/qml/qml/qqmlpropertycachecreator.cpp index bd4f2a0612..bd4f2a0612 100644 --- a/src/qml/compiler/qqmlpropertycachecreator.cpp +++ b/src/qml/qml/qqmlpropertycachecreator.cpp diff --git a/src/qml/compiler/qqmlpropertycachecreator_p.h b/src/qml/qml/qqmlpropertycachecreator_p.h index 28eea27675..28eea27675 100644 --- a/src/qml/compiler/qqmlpropertycachecreator_p.h +++ b/src/qml/qml/qqmlpropertycachecreator_p.h diff --git a/src/qml/compiler/qqmlpropertyresolver.cpp b/src/qml/qml/qqmlpropertyresolver.cpp index 90eaca0b90..90eaca0b90 100644 --- a/src/qml/compiler/qqmlpropertyresolver.cpp +++ b/src/qml/qml/qqmlpropertyresolver.cpp diff --git a/src/qml/compiler/qqmlpropertyresolver_p.h b/src/qml/qml/qqmlpropertyresolver_p.h index df857f242e..df857f242e 100644 --- a/src/qml/compiler/qqmlpropertyresolver_p.h +++ b/src/qml/qml/qqmlpropertyresolver_p.h diff --git a/src/qml/compiler/qqmlpropertyvalidator.cpp b/src/qml/qml/qqmlpropertyvalidator.cpp index 71d5318652..71d5318652 100644 --- a/src/qml/compiler/qqmlpropertyvalidator.cpp +++ b/src/qml/qml/qqmlpropertyvalidator.cpp diff --git a/src/qml/compiler/qqmlpropertyvalidator_p.h b/src/qml/qml/qqmlpropertyvalidator_p.h index 8244b2df21..8244b2df21 100644 --- a/src/qml/compiler/qqmlpropertyvalidator_p.h +++ b/src/qml/qml/qqmlpropertyvalidator_p.h diff --git a/src/qml/compiler/qqmltypecompiler.cpp b/src/qml/qml/qqmltypecompiler.cpp index 66320b8db9..66320b8db9 100644 --- a/src/qml/compiler/qqmltypecompiler.cpp +++ b/src/qml/qml/qqmltypecompiler.cpp diff --git a/src/qml/compiler/qqmltypecompiler_p.h b/src/qml/qml/qqmltypecompiler_p.h index f588909c42..f588909c42 100644 --- a/src/qml/compiler/qqmltypecompiler_p.h +++ b/src/qml/qml/qqmltypecompiler_p.h |