diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2015-04-16 22:15:27 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-06-05 08:37:28 +0000 |
| commit | 13ec9ab3b898a67403ce0031c4cfdc74d95d5560 (patch) | |
| tree | fb1242373ebb385ccc306e02b941d9a64c3d6ff9 /src/qml/qml/qqmlvaluetypeproxybinding.cpp | |
| parent | db568f812464644b36418415a05399ccdf2022c2 (diff) | |
Move the target object into the base class
Change-Id: I912d7665b49c8e9b2d38e78bfcfc4b3d39ca7459
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/qml/qml/qqmlvaluetypeproxybinding.cpp')
| -rw-r--r-- | src/qml/qml/qqmlvaluetypeproxybinding.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/qml/qml/qqmlvaluetypeproxybinding.cpp b/src/qml/qml/qqmlvaluetypeproxybinding.cpp index f0457d25e3..a12699facf 100644 --- a/src/qml/qml/qqmlvaluetypeproxybinding.cpp +++ b/src/qml/qml/qqmlvaluetypeproxybinding.cpp @@ -36,8 +36,11 @@ QT_BEGIN_NAMESPACE QQmlValueTypeProxyBinding::QQmlValueTypeProxyBinding(QObject *o, int index) -: QQmlAbstractBinding(ValueTypeProxy), m_object(o), m_index(index), m_bindings(0) + : QQmlAbstractBinding(ValueTypeProxy), + m_targetIndex(index), + m_bindings(0) { + m_target = o; } QQmlValueTypeProxyBinding::~QQmlValueTypeProxyBinding() @@ -103,12 +106,7 @@ void QQmlValueTypeProxyBinding::removeBindings(quint32 mask) int QQmlValueTypeProxyBinding::targetPropertyIndex() const { - return m_index; -} - -QObject *QQmlValueTypeProxyBinding::targetObject() const -{ - return m_object; + return m_targetIndex; } QT_END_NAMESPACE |