summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-06-12 19:18:58 +0200
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2013-06-12 19:18:59 +0200
commit9e1c1737c2630d7f1b98c83455c66038cbddcd83 (patch)
treeb1807cf64a268f33f73f7aee5fee810a4df89c44 /src/declarative/qml
parenta469bc673b20751eaaedd29c3efb9462ae148538 (diff)
parent05148b648d63eddca797fada19d131d8affdc456 (diff)
Merge remote-tracking branch 'origin/stable' into dev
Diffstat (limited to 'src/declarative/qml')
-rw-r--r--src/declarative/qml/qdeclarativebinding.cpp4
-rw-r--r--src/declarative/qml/qdeclarativebinding_p.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/qml/qdeclarativebinding.cpp b/src/declarative/qml/qdeclarativebinding.cpp
index 9048fee1..cdfb5ce4 100644
--- a/src/declarative/qml/qdeclarativebinding.cpp
+++ b/src/declarative/qml/qdeclarativebinding.cpp
@@ -486,8 +486,10 @@ QString QDeclarativeBinding::expression() const
}
QDeclarativeValueTypeProxyBinding::QDeclarativeValueTypeProxyBinding(QObject *o, int index)
-: m_object(o), m_index(index), m_bindings(0)
+: m_bindings(0)
{
+ Q_UNUSED(o);
+ Q_UNUSED(index);
}
QDeclarativeValueTypeProxyBinding::~QDeclarativeValueTypeProxyBinding()
diff --git a/src/declarative/qml/qdeclarativebinding_p.h b/src/declarative/qml/qdeclarativebinding_p.h
index 5926c439..bb92e2b9 100644
--- a/src/declarative/qml/qdeclarativebinding_p.h
+++ b/src/declarative/qml/qdeclarativebinding_p.h
@@ -136,8 +136,6 @@ private:
void recursiveDisable(QDeclarativeAbstractBinding *);
friend class QDeclarativeAbstractBinding;
- QObject *m_object;
- int m_index;
QDeclarativeAbstractBinding *m_bindings;
};