diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-06-20 11:32:45 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@digia.com> | 2013-06-20 21:57:28 +0200 |
| commit | 343978ce543b4b901bb009f0c5ebabb7563fe98b (patch) | |
| tree | e1c97975faf705786fbe8ce644fc0bf83c127e12 /src/qml/qml/qqmlvaluetypewrapper_p.h | |
| parent | 0117641a5bfb8f53ff80b291197db5426f689d0d (diff) | |
Fix qqmlvaluetypewrapper auto-tests
QQmlValueTypeWrapper stores its prototype in a global variable
(PersistentValue), which doesn't work when using multiple engines. Instead
this patch introduces the QML extensions structure to hold things like
prototypes for type extensions to JS that are specific to QML.
Change-Id: I41a71029edb6ce895eb80db7aa0809aab86b31db
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlvaluetypewrapper_p.h')
| -rw-r--r-- | src/qml/qml/qqmlvaluetypewrapper_p.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlvaluetypewrapper_p.h b/src/qml/qml/qqmlvaluetypewrapper_p.h index 4841bcc523..ccf4fd300a 100644 --- a/src/qml/qml/qqmlvaluetypewrapper_p.h +++ b/src/qml/qml/qqmlvaluetypewrapper_p.h @@ -95,7 +95,6 @@ public: mutable QQmlValueType *type; static void initProto(ExecutionEngine *v4); - static PersistentValue proto; }; } |