aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/compiler/qqmltypecompiler.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2014-01-07 15:35:20 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-01-10 10:26:43 +0100
commit5c40193f8223a8bdefcf694c719396807a83f0ea (patch)
tree626991eb96b9da976cf0ebe6c944012e81effe0b /src/qml/compiler/qqmltypecompiler.cpp
parentb681bd3e4ad20eb558da68ba1a2e2dfddfab9cf1 (diff)
[new compiler] Add support for implicitly defined components
Use-cases like itemDelegate: Item { ... } implicitly define a component without the item-surrounding Component {}, base on the fact that the property itself is of type QQmlComponent (or derived). This means we have to synthesize a Component {} object and insert it into the data structure. Change-Id: I8992451a5a6732c7fd898eaf83c276dc6a8b7d19 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/compiler/qqmltypecompiler.cpp')
-rw-r--r--src/qml/compiler/qqmltypecompiler.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/qml/compiler/qqmltypecompiler.cpp b/src/qml/compiler/qqmltypecompiler.cpp
index b5a48f3611..f39ea2f3c7 100644
--- a/src/qml/compiler/qqmltypecompiler.cpp
+++ b/src/qml/compiler/qqmltypecompiler.cpp
@@ -224,6 +224,11 @@ QString QQmlTypeCompiler::stringAt(int idx) const
return parsedQML->stringAt(idx);
}
+int QQmlTypeCompiler::registerString(const QString &str)
+{
+ return parsedQML->jsGenerator.registerString(str);
+}
+
const QV4::CompiledData::QmlUnit *QQmlTypeCompiler::qmlUnit() const
{
return compiledData->qmlUnit;
@@ -274,4 +279,9 @@ QHash<int, QByteArray> *QQmlTypeCompiler::customParserData()
return &compiledData->customParserData;
}
+MemoryPool *QQmlTypeCompiler::memoryPool()
+{
+ return parsedQML->jsParserEngine.pool();
+}
+
QT_END_NAMESPACE