diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-11-13 03:30:44 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-11-13 03:30:44 (GMT) |
| commit | 9e6960ed4ce172c61895b81aaaf541415e08dafd (patch) | |
| tree | 49205bc77d156cd44147350dd1341a3d092ef397 /src | |
| parent | d70f057db1b5765764257530c88f5c0350cf9146 (diff) | |
| parent | bc8d2541960c706dbb765755d8c661ae608cbedc (diff) | |
| download | Qt-9e6960ed4ce172c61895b81aaaf541415e08dafd.zip Qt-9e6960ed4ce172c61895b81aaaf541415e08dafd.tar.gz Qt-9e6960ed4ce172c61895b81aaaf541415e08dafd.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/graphicsitems/qmlgraphicsgridview.cpp | 2 | ||||
| -rw-r--r-- | src/declarative/qml/qmlmetatype.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/graphicsitems/qmlgraphicsgridview.cpp b/src/declarative/graphicsitems/qmlgraphicsgridview.cpp index 1b94426..29eb983 100644 --- a/src/declarative/graphicsitems/qmlgraphicsgridview.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsgridview.cpp @@ -353,7 +353,7 @@ FxGridItem *QmlGraphicsGridViewPrivate::createItem(int modelIndex) listItem->index = modelIndex; // complete model->completeItem(); - listItem->item->setZValue(modelIndex + 1); + listItem->item->setZValue(1); listItem->item->setParent(q->viewport()); } requestedIndex = 0; diff --git a/src/declarative/qml/qmlmetatype.h b/src/declarative/qml/qmlmetatype.h index 9a17c34..99d6743 100644 --- a/src/declarative/qml/qmlmetatype.h +++ b/src/declarative/qml/qmlmetatype.h @@ -220,7 +220,7 @@ int qmlRegisterExtendedType(const char *typeName) attachedMo = QmlPrivate::attachedPropertiesMetaObject<T>(); } - return QmlMetaType::registerType(ids, QmlPrivate::list_nocreate_op<T>, 0, 0, 0, 0, 0, + return QmlMetaType::registerType(ids, QmlPrivate::list_nocreate_op<T>, 0, 0, 0, 0, &T::staticMetaObject, attached, attachedMo, QmlPrivate::StaticCastSelector<T,QmlParserStatus>::cast(), QmlPrivate::StaticCastSelector<T,QObject>::cast(), |