diff options
author | Alan Alpert <alan.alpert@nokia.com> | 2009-09-22 06:48:17 (GMT) |
---|---|---|
committer | Alan Alpert <alan.alpert@nokia.com> | 2009-09-22 06:48:17 (GMT) |
commit | 83fa27d3fc692e06e10cb0dd57b8f59b38d24637 (patch) | |
tree | e31c07fed44c59bd83ef576859fa31ecb8908804 /demos | |
parent | 3846e7c9c602b3dcc06516aaee582aedf9c0f436 (diff) | |
parent | cf82572d50470a4d48d1c564b55ad79bb205b228 (diff) | |
download | Qt-83fa27d3fc692e06e10cb0dd57b8f59b38d24637.zip Qt-83fa27d3fc692e06e10cb0dd57b8f59b38d24637.tar.gz Qt-83fa27d3fc692e06e10cb0dd57b8f59b38d24637.tar.bz2 |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'demos')
-rw-r--r-- | demos/declarative/minehunt/main.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/demos/declarative/minehunt/main.cpp b/demos/declarative/minehunt/main.cpp index 20f7492..a9b8828 100644 --- a/demos/declarative/minehunt/main.cpp +++ b/demos/declarative/minehunt/main.cpp @@ -2,7 +2,7 @@ #include "qmlcontext.h" #include "qml.h" #include <qfxitem.h> -#include <qfxview.h> +#include <qmlview.h> #include <QWidget> #include <QApplication> @@ -94,7 +94,7 @@ private: int getHint(int row, int col); void setPlaying(bool b){if(b==playing) return; playing=b; emit isPlayingChanged();} - QFxView *canvas; + QmlView *canvas; QList<Tile *> _tiles; int numCols; @@ -123,7 +123,7 @@ MyWidget::MyWidget(int width, int height, QWidget *parent, Qt::WindowFlags flags vbox->setMargin(0); setLayout(vbox); - canvas = new QFxView(this); + canvas = new QmlView(this); canvas->setFixedSize(width, height); vbox->addWidget(canvas); |