diff options
| author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-03-23 14:16:43 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-27 05:17:13 +0200 |
| commit | 965588737321d10fd1fbca3f89b4c6257b7b5d47 (patch) | |
| tree | 95d069b6ce910c4f8bf8f71d50bebc4fe35a6b1f /src/qml/qml/ftw/qflagpointer_p.h | |
| parent | 4a161cfa0cf9167b575bdf7ff5685b9bf17c6960 (diff) | |
Restrict v8 property lookup to the execution context
When resolving property names, only properties known to the current
context of execution should be available. If a property name has
been overriden by a component extension, code executing in the
context of the base component should resolve the property name to
the property available inside the base component or its bases.
Task-number: QTBUG-24891
Change-Id: I9687cc28e108226d5a939627a901c8254344b598
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/qml/qml/ftw/qflagpointer_p.h')
| -rw-r--r-- | src/qml/qml/ftw/qflagpointer_p.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/qml/qml/ftw/qflagpointer_p.h b/src/qml/qml/ftw/qflagpointer_p.h index a4b20d9e2a..6200b05878 100644 --- a/src/qml/qml/ftw/qflagpointer_p.h +++ b/src/qml/qml/ftw/qflagpointer_p.h @@ -82,6 +82,8 @@ public: inline T *operator->() const; inline T *operator*() const; + inline T *data() const; + private: quintptr ptr_value; @@ -225,6 +227,12 @@ T *QFlagPointer<T>::operator*() const return (T *)(ptr_value & ~FlagsMask); } +template<typename T> +T *QFlagPointer<T>::data() const +{ + return (T *)(ptr_value & ~FlagsMask); +} + template<typename T, typename T2> QBiPointer<T, T2>::QBiPointer() : ptr_value(0) |