diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/declarative/qml/parser/qdeclarativejs.g | 1 | ||||
| -rw-r--r-- | src/declarative/qml/qdeclarativebinding.cpp | 4 | ||||
| -rw-r--r-- | src/declarative/qml/qdeclarativebinding_p.h | 2 | ||||
| -rw-r--r-- | src/declarative/qml/qdeclarativeprivate.h | 3 | ||||
| -rw-r--r-- | src/imports/shaders/scenegraph/qsggeometry.cpp | 2 |
6 files changed, 8 insertions, 6 deletions
diff --git a/.qmake.conf b/.qmake.conf index 6aa780ca..a7e09bff 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,4 +1,4 @@ load(qt_build_config) CONFIG += qt_example_installs -MODULE_VERSION = 5.1.0 +MODULE_VERSION = 5.1.1 diff --git a/src/declarative/qml/parser/qdeclarativejs.g b/src/declarative/qml/parser/qdeclarativejs.g index 19364c3f..dc466aec 100644 --- a/src/declarative/qml/parser/qdeclarativejs.g +++ b/src/declarative/qml/parser/qdeclarativejs.g @@ -1,7 +1,6 @@ ---------------------------------------------------------------------------- -- -- Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). --- All rights reserved. -- Contact: http://www.qt-project.org/legal -- -- This file is part of the QtDeclarative module of the Qt Toolkit. 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/declarative/qml/qdeclarativeprivate.h b/src/declarative/qml/qdeclarativeprivate.h index 05a457c3..6f95dde7 100644 --- a/src/declarative/qml/qdeclarativeprivate.h +++ b/src/declarative/qml/qdeclarativeprivate.h @@ -55,6 +55,7 @@ #include <QtDeclarative/qtdeclarativeglobal.h> #include <QtCore/qvariant.h> +#include <QtCore/qurl.h> QT_BEGIN_NAMESPACE @@ -232,7 +233,7 @@ namespace QDeclarativePrivate }; struct RegisterComponent { - const QUrl &url; + QUrl url; const char *uri; const char *typeName; int majorVersion; 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... |