diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-02-07 10:24:49 +0100 |
|---|---|---|
| committer | Andrew den Exter <andrew.den-exter@nokia.com> | 2012-02-08 00:57:50 +0100 |
| commit | 504a6deeef537e918fa14de52b72b53c42a11a28 (patch) | |
| tree | 082eeab911c72aacced5f707865e2b55e1ad74c1 /src | |
| parent | fd605735233bce061a5c541d7bd36c77fd588b99 (diff) | |
QtQuick1: Fix warnings of gcc 4.6
- Fix warnings.
- Remove duplicate entries from profile.
Change-Id: I7b4a3cd71ec7d1c11b3530c95f57fef3a3041b16
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/qml/qdeclarativecompiler.cpp | 6 | ||||
| -rw-r--r-- | src/declarative/qml/qdeclarativeproperty.cpp | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp index 8c85f1a5..6ec38c5c 100644 --- a/src/declarative/qml/qdeclarativecompiler.cpp +++ b/src/declarative/qml/qdeclarativecompiler.cpp @@ -266,7 +266,7 @@ bool QDeclarativeCompiler::testLiteralAssignment(const QMetaProperty &prop, case QVariant::PointF: { bool ok; - QPointF point = QDeclarativeStringConverters::pointFFromString(string, &ok); + QDeclarativeStringConverters::pointFFromString(string, &ok); if (!ok) COMPILE_EXCEPTION(v, tr("Invalid property assignment: point expected")); } break; @@ -274,7 +274,7 @@ bool QDeclarativeCompiler::testLiteralAssignment(const QMetaProperty &prop, case QVariant::SizeF: { bool ok; - QSizeF size = QDeclarativeStringConverters::sizeFFromString(string, &ok); + QDeclarativeStringConverters::sizeFFromString(string, &ok); if (!ok) COMPILE_EXCEPTION(v, tr("Invalid property assignment: size expected")); } break; @@ -282,7 +282,7 @@ bool QDeclarativeCompiler::testLiteralAssignment(const QMetaProperty &prop, case QVariant::RectF: { bool ok; - QRectF rect = QDeclarativeStringConverters::rectFFromString(string, &ok); + QDeclarativeStringConverters::rectFFromString(string, &ok); if (!ok) COMPILE_EXCEPTION(v, tr("Invalid property assignment: rect expected")); } break; diff --git a/src/declarative/qml/qdeclarativeproperty.cpp b/src/declarative/qml/qdeclarativeproperty.cpp index 88b2631e..158e561d 100644 --- a/src/declarative/qml/qdeclarativeproperty.cpp +++ b/src/declarative/qml/qdeclarativeproperty.cpp @@ -1447,7 +1447,6 @@ struct ValueTypeSerializedData : public SerializedData { QByteArray QDeclarativePropertyPrivate::saveValueType(const QMetaObject *metaObject, int index, const QMetaObject *subObject, int subIndex) { - QMetaProperty prop = metaObject->property(index); QMetaProperty subProp = subObject->property(subIndex); ValueTypeSerializedData sd; |