diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-05-10 09:11:26 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-10 11:42:23 +0200 |
commit | ebebf96230684b397ced702ea277eec55337c165 (patch) | |
tree | 0a0bbf3a87e6d84df44f2d563d80dce18d7a4bd1 /src/declarative/qml/qdeclarativecontextscriptclass.cpp | |
parent | 9a6d754e61ba57b8bf7a864011750910ac58ccbf (diff) |
QtQuick1: Fix build warnings.
- Add missing .json file.
- Fix warnings about unused variables, deprecated cast from char*.
Change-Id: Ibb5065e604460ff945b3e452b2270d2b7368ea49
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Diffstat (limited to 'src/declarative/qml/qdeclarativecontextscriptclass.cpp')
-rw-r--r-- | src/declarative/qml/qdeclarativecontextscriptclass.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativecontextscriptclass.cpp b/src/declarative/qml/qdeclarativecontextscriptclass.cpp index da9c05de..ee8afb2d 100644 --- a/src/declarative/qml/qdeclarativecontextscriptclass.cpp +++ b/src/declarative/qml/qdeclarativecontextscriptclass.cpp @@ -300,7 +300,7 @@ QDeclarativeContextScriptClass::property(Object *object, const Identifier &name) QDeclarativeContextPrivate *cp = bindContext->asQDeclarativeContextPrivate(); const QVariant &value = cp->propertyValues.at(lastPropertyIndex); if (value.userType() == qMetaTypeId<QList<QObject*> >()) { - rv = ep->listClass->newList(QDeclarativeListProperty<QObject>(bindContext->asQDeclarativeContext(), (void*)lastPropertyIndex, 0, QDeclarativeContextPrivate::context_count, QDeclarativeContextPrivate::context_at), qMetaTypeId<QDeclarativeListProperty<QObject> >()); + rv = ep->listClass->newList(QDeclarativeListProperty<QObject>(bindContext->asQDeclarativeContext(), (void*)qintptr(lastPropertyIndex), 0, QDeclarativeContextPrivate::context_count, QDeclarativeContextPrivate::context_at), qMetaTypeId<QDeclarativeListProperty<QObject> >()); } else { rv = ep->scriptValueFromVariant(value); } |