diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2013-09-08 11:05:20 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-12 23:00:19 +0200 |
commit | 346662cb011b7962a8cabf6d55742cd050a6ba6c (patch) | |
tree | ef71f9e15cfb6816c793eff5c9c097cf2d121ff9 /src/qml/qml/qqmlpropertycache_p.h | |
parent | 845b07dad47e63bf285461433f4321d71c6c343d (diff) |
Fix error reporting timing
Errors for example in signal declarations are usually reported in the loader
thread, during property cache construction. This patch separates out the
property cache population into QQmlPropertyCacheCreator, runs it from the
loader thread and reduces the QQmlObjectCreator to merely set the properties/bindings/
functions on the object.
This also enables location tracking for signal declarations and their error reporting.
Change-Id: Ief1ffbb3113f8279a50d1a12dab8dbe096702a60
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlpropertycache_p.h')
-rw-r--r-- | src/qml/qml/qqmlpropertycache_p.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/qml/qml/qqmlpropertycache_p.h b/src/qml/qml/qqmlpropertycache_p.h index fe509843ab..32c0018819 100644 --- a/src/qml/qml/qqmlpropertycache_p.h +++ b/src/qml/qml/qqmlpropertycache_p.h @@ -66,10 +66,6 @@ QT_BEGIN_NAMESPACE -namespace QtQml { -class QmlObjectCreator; -} - class QV8Engine; class QMetaProperty; class QQmlEngine; @@ -78,6 +74,7 @@ class QQmlAccessors; class QMetaObjectBuilder; class QQmlPropertyCacheMethodArguments; class QQmlVMEMetaObject; +class QQmlPropertyCacheCreator; // We have this somewhat awful split between RawData and Data so that RawData can be // used in unions. In normal code, you should always use Data which initializes RawData @@ -343,7 +340,7 @@ protected: private: friend class QQmlEnginePrivate; friend class QQmlCompiler; - friend class QtQml::QmlObjectCreator; + friend class QQmlPropertyCacheCreator; inline QQmlPropertyCache *copy(int reserve); |