diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-02-23 23:31:31 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-02-23 23:31:31 (GMT) |
| commit | ec7ac34b4a6b1a330460838acc74a53d29f62a7c (patch) | |
| tree | 5505189d15ce0a1f3b67f4cd65e4c39766080a1d /demos/declarative/minehunt | |
| parent | 8727985d81c793d52d5e24ed6815e7237ae879f1 (diff) | |
| parent | d19f691a5646725c69b232e2adde8c2f961eb571 (diff) | |
| download | Qt-ec7ac34b4a6b1a330460838acc74a53d29f62a7c.zip Qt-ec7ac34b4a6b1a330460838acc74a53d29f62a7c.tar.gz Qt-ec7ac34b4a6b1a330460838acc74a53d29f62a7c.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Conflicts:
src/declarative/util/qmlanimation.cpp
src/declarative/util/qmlxmllistmodel.cpp
Diffstat (limited to 'demos/declarative/minehunt')
| -rw-r--r-- | demos/declarative/minehunt/main.cpp | 4 | ||||
| -rw-r--r-- | demos/declarative/minehunt/minehunt.qml | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/demos/declarative/minehunt/main.cpp b/demos/declarative/minehunt/main.cpp index 9c225af..0b2d818 100644 --- a/demos/declarative/minehunt/main.cpp +++ b/demos/declarative/minehunt/main.cpp @@ -166,13 +166,11 @@ MyWidget::MyWidget(int width, int height, QWidget *parent, Qt::WindowFlags flags canvas->setFixedSize(width, height); vbox->addWidget(canvas); - canvas->setSource(QUrl::fromLocalFile(fileName)); - QmlContext *ctxt = canvas->rootContext(); ctxt->addDefaultObject(this); ctxt->setContextProperty("tiles", QVariant::fromValue<QList<Tile*>*>(&_tiles));//QTBUG-5675 - canvas->execute(); + canvas->setSource(QUrl::fromLocalFile(fileName)); } MyWidget::~MyWidget() diff --git a/demos/declarative/minehunt/minehunt.qml b/demos/declarative/minehunt/minehunt.qml index 92555c2..617a6ed 100644 --- a/demos/declarative/minehunt/minehunt.qml +++ b/demos/declarative/minehunt/minehunt.qml @@ -92,7 +92,7 @@ Item { } } NumberAnimation { - easing: "easeInOutQuad" + easing.type: "InOutQuad" properties: "angle" } ScriptAction{ |