aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmltypeloader.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2013-09-13 16:39:00 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-20 14:26:23 +0200
commitd071acf7ff4573cdf7dbea801f40375611243551 (patch)
treeec34f84d8d795b2996da63e74183eba93fff4ee3 /src/qml/qml/qqmltypeloader.cpp
parent269e29fdf36dd700d8c985dc7f11dbb5c8746c51 (diff)
[new compiler] Initial support for attached properties
Attached properties are implemented similarly to group properties, except that the object operated on isn't a QQmlValueType from a property (i.e. font) but the QObject that implements the attached properties. Change-Id: If73751162c191c65512ca1bddadd6270e6e33793 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/qqmltypeloader.cpp')
-rw-r--r--src/qml/qml/qqmltypeloader.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp
index 9ca41f6071..8c8f8c9c25 100644
--- a/src/qml/qml/qqmltypeloader.cpp
+++ b/src/qml/qml/qqmltypeloader.cpp
@@ -49,6 +49,7 @@
#include <private/qqmlcomponent_p.h>
#include <private/qqmlprofilerservice_p.h>
#include <private/qqmlmemoryprofiler_p.h>
+#include <private/qqmlcodegenerator_p.h>
#include <QtCore/qdir.h>
#include <QtCore/qfile.h>
@@ -2175,19 +2176,18 @@ void QQmlTypeData::compile()
QQmlEngine *engine = typeLoader()->engine();
- QHash<int, QQmlPropertyCache*> resolvedPropertyCaches;
-
for (QHash<int, TypeReference>::ConstIterator resolvedType = m_resolvedTypes.constBegin(), end = m_resolvedTypes.constEnd();
resolvedType != end; ++resolvedType) {
QQmlCompiledData::TypeReference ref;
ref.type = resolvedType->type;
Q_ASSERT(ref.type);
- resolvedPropertyCaches.insert(resolvedType.key(), ref.createPropertyCache(engine));
m_compiledData->resolvedTypes.insert(resolvedType.key(), ref);
}
{
- SignalHandlerConverter converter(parsedQML.data(), resolvedPropertyCaches, m_compiledData);
+ SignalHandlerConverter converter(QQmlEnginePrivate::get(engine),
+ parsedQML.data(),
+ m_compiledData);
if (!converter.convertSignalHandlerExpressionsToFunctionDeclarations()) {
setError(converter.errors);
m_compiledData->release();