diff options
| author | Martin Jones <martin.jones@nokia.com> | 2011-07-11 13:47:51 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-12 06:38:09 +0200 |
| commit | 4442dea01b9d4d45964228ac442166d89f091f9e (patch) | |
| tree | 28ae20cb26967765a988b1ee522fc2d64d777671 /examples/declarative/modelviews | |
| parent | b119220da60453ecf31898f7a57eda9d3c4e9225 (diff) | |
Extract all QtQuick 1 elements into a separate library/plugin.
Change-Id: I41a280de2739ee08202f4be2519e5012870090f2
Reviewed-on: http://codereview.qt.nokia.com/1391
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'examples/declarative/modelviews')
4 files changed, 9 insertions, 10 deletions
diff --git a/examples/declarative/modelviews/objectlistmodel/main.cpp b/examples/declarative/modelviews/objectlistmodel/main.cpp index 812d8addf1..345b5eec87 100644 --- a/examples/declarative/modelviews/objectlistmodel/main.cpp +++ b/examples/declarative/modelviews/objectlistmodel/main.cpp @@ -43,8 +43,8 @@ #include <qdeclarativeengine.h> #include <qdeclarativecontext.h> #include <qdeclarative.h> -#include <qdeclarativeitem.h> -#include <qdeclarativeview.h> +#include <qsgitem.h> +#include <qsgview.h> #include "dataobject.h" @@ -64,7 +64,8 @@ int main(int argc, char ** argv) dataList.append(new DataObject("Item 3", "blue")); dataList.append(new DataObject("Item 4", "yellow")); - QDeclarativeView view; + QSGView view; + view.setResizeMode(QSGView::SizeRootObjectToView); QDeclarativeContext *ctxt = view.rootContext(); ctxt->setContextProperty("myModel", QVariant::fromValue(dataList)); //![0] diff --git a/examples/declarative/modelviews/objectlistmodel/view.qml b/examples/declarative/modelviews/objectlistmodel/view.qml index 264289f3bf..6dab6d95f0 100644 --- a/examples/declarative/modelviews/objectlistmodel/view.qml +++ b/examples/declarative/modelviews/objectlistmodel/view.qml @@ -38,12 +38,11 @@ ** ****************************************************************************/ -import QtQuick 1.0 +import QtQuick 2.0 //![0] ListView { width: 100; height: 100 - anchors.fill: parent model: myModel delegate: Rectangle { diff --git a/examples/declarative/modelviews/stringlistmodel/main.cpp b/examples/declarative/modelviews/stringlistmodel/main.cpp index b3452baf5b..c69963b89a 100644 --- a/examples/declarative/modelviews/stringlistmodel/main.cpp +++ b/examples/declarative/modelviews/stringlistmodel/main.cpp @@ -43,8 +43,8 @@ #include <qdeclarativeengine.h> #include <qdeclarativecontext.h> #include <qdeclarative.h> -#include <qdeclarativeitem.h> -#include <qdeclarativeview.h> +#include <qsgitem.h> +#include <qsgview.h> /* @@ -63,7 +63,7 @@ int main(int argc, char ** argv) dataList.append("Item 3"); dataList.append("Item 4"); - QDeclarativeView view; + QSGView view; QDeclarativeContext *ctxt = view.rootContext(); ctxt->setContextProperty("myModel", QVariant::fromValue(dataList)); //![0] diff --git a/examples/declarative/modelviews/stringlistmodel/view.qml b/examples/declarative/modelviews/stringlistmodel/view.qml index 9c65d80514..d4dfb3e97b 100644 --- a/examples/declarative/modelviews/stringlistmodel/view.qml +++ b/examples/declarative/modelviews/stringlistmodel/view.qml @@ -38,12 +38,11 @@ ** ****************************************************************************/ -import QtQuick 1.0 +import QtQuick 2.0 //![0] ListView { width: 100; height: 100 - anchors.fill: parent model: myModel delegate: Rectangle { |