diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2018-07-26 15:31:46 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2018-07-31 17:08:51 +0000 |
| commit | 71c66d4b41be95b44ffa0d9bbbf04164f74bd23a (patch) | |
| tree | 5ebe04d2a762f9a8cf38a468a2c5c8c4ccea74fe /src | |
| parent | 2312f5a2b4fd775933f54c9d8435ea047de2310a (diff) | |
Remove unused flag
Change-Id: Ib9028ffa8c7d014598da60bfe44e004031bf6017
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/qml/compiler/qqmlirbuilder.cpp | 1 | ||||
| -rw-r--r-- | src/qml/compiler/qv4compileddata_p.h | 9 | ||||
| -rw-r--r-- | src/qml/qml/qqmltypeloader.cpp | 1 |
3 files changed, 4 insertions, 7 deletions
diff --git a/src/qml/compiler/qqmlirbuilder.cpp b/src/qml/compiler/qqmlirbuilder.cpp index 293d6d2655..bc877f51e1 100644 --- a/src/qml/compiler/qqmlirbuilder.cpp +++ b/src/qml/compiler/qqmlirbuilder.cpp @@ -1613,7 +1613,6 @@ void QmlUnitGenerator::generate(Document &output, const QV4::CompiledData::Depen QV4::CompiledData::Unit *qmlUnit = reinterpret_cast<QV4::CompiledData::Unit *>(data); qmlUnit->unitSize = totalSize; - qmlUnit->flags |= QV4::CompiledData::Unit::IsQml; // This unit's memory was allocated with malloc on the heap, so it's // definitely not suitable for StaticData access. qmlUnit->flags &= ~QV4::CompiledData::Unit::StaticData; diff --git a/src/qml/compiler/qv4compileddata_p.h b/src/qml/compiler/qv4compileddata_p.h index a891a761eb..dd0d92b0fa 100644 --- a/src/qml/compiler/qv4compileddata_p.h +++ b/src/qml/compiler/qv4compileddata_p.h @@ -776,11 +776,10 @@ struct Unit enum : unsigned int { IsJavascript = 0x1, - IsQml = 0x2, - StaticData = 0x4, // Unit data persistent in memory? - IsSingleton = 0x8, - IsSharedLibrary = 0x10, // .pragma shared? - PendingTypeCompilation = 0x20 // the QML data structures present are incomplete and require type compilation + StaticData = 0x2, // Unit data persistent in memory? + IsSingleton = 0x4, + IsSharedLibrary = 0x8, // .pragma shared? + PendingTypeCompilation = 0x10 // the QML data structures present are incomplete and require type compilation }; quint32_le flags; quint32_le stringTableSize; diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp index 64a0a04cd7..92dd1a59c2 100644 --- a/src/qml/qml/qqmltypeloader.cpp +++ b/src/qml/qml/qqmltypeloader.cpp @@ -3097,7 +3097,6 @@ void QQmlScriptBlob::initializeFromCompilationUnit(const QQmlRefPointer<QV4::Com m_importCache.setBaseUrl(finalUrl(), finalUrlString()); - Q_ASSERT(m_scriptData->m_precompiledScript->unitData()->flags & QV4::CompiledData::Unit::IsQml); const QV4::CompiledData::Unit *qmlUnit = m_scriptData->m_precompiledScript->unitData(); QList<QQmlError> errors; |