diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-12 19:18:58 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-12 19:18:59 +0200 |
commit | 9e1c1737c2630d7f1b98c83455c66038cbddcd83 (patch) | |
tree | b1807cf64a268f33f73f7aee5fee810a4df89c44 | |
parent | a469bc673b20751eaaedd29c3efb9462ae148538 (diff) | |
parent | 05148b648d63eddca797fada19d131d8affdc456 (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I19a932141748119ccdc0a9cd9f926403f67f5968
-rw-r--r-- | src/declarative/qml/qdeclarativebinding.cpp | 4 | ||||
-rw-r--r-- | src/declarative/qml/qdeclarativebinding_p.h | 2 | ||||
-rw-r--r-- | src/imports/shaders/scenegraph/qsggeometry.cpp | 2 |
3 files changed, 5 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; }; diff --git a/src/imports/shaders/scenegraph/qsggeometry.cpp b/src/imports/shaders/scenegraph/qsggeometry.cpp index f5c497fb..41f599bc 100644 --- a/src/imports/shaders/scenegraph/qsggeometry.cpp +++ b/src/imports/shaders/scenegraph/qsggeometry.cpp @@ -94,6 +94,8 @@ QSGGeometry::QSGGeometry(const QSGGeometry::AttributeSet &attributes, { Q_ASSERT(m_attributes.count > 0); Q_ASSERT(m_attributes.stride > 0); + Q_UNUSED(m_reserved_pointer); + Q_UNUSED(m_reserved_bits); // Because allocate reads m_vertex_count, m_index_count and m_owns_data, these // need to be set before calling allocate... |