aboutsummaryrefslogtreecommitdiffstats
path: root/examples/demos/minehunt
diff options
context:
space:
mode:
Diffstat (limited to 'examples/demos/minehunt')
-rw-r--r--examples/demos/minehunt/MinehuntCore/Explosion.qml2
-rw-r--r--examples/demos/minehunt/MinehuntCore/Tile.qml2
-rw-r--r--examples/demos/minehunt/main.cpp4
-rw-r--r--examples/demos/minehunt/minehunt.cpp10
-rw-r--r--examples/demos/minehunt/minehunt.h6
-rw-r--r--examples/demos/minehunt/minehunt.pro2
-rw-r--r--examples/demos/minehunt/minehunt.qml2
7 files changed, 14 insertions, 14 deletions
diff --git a/examples/demos/minehunt/MinehuntCore/Explosion.qml b/examples/demos/minehunt/MinehuntCore/Explosion.qml
index 0983b68db4..a1b4292bcf 100644
--- a/examples/demos/minehunt/MinehuntCore/Explosion.qml
+++ b/examples/demos/minehunt/MinehuntCore/Explosion.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/minehunt/MinehuntCore/Tile.qml b/examples/demos/minehunt/MinehuntCore/Tile.qml
index 14c1f51f9e..1180b6f584 100644
--- a/examples/demos/minehunt/MinehuntCore/Tile.qml
+++ b/examples/demos/minehunt/MinehuntCore/Tile.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/minehunt/main.cpp b/examples/demos/minehunt/main.cpp
index 47c0436969..0aa11a1d7a 100644
--- a/examples/demos/minehunt/main.cpp
+++ b/examples/demos/minehunt/main.cpp
@@ -41,8 +41,8 @@
#include <QtGui/QGuiApplication>
#include <QtQuick/qquickview.h>
-#include <QtDeclarative/QDeclarativeContext>
-#include <QtDeclarative/QDeclarativeEngine>
+#include <QtQml/QQmlContext>
+#include <QtQml/QQmlEngine>
#include "minehunt.h"
diff --git a/examples/demos/minehunt/minehunt.cpp b/examples/demos/minehunt/minehunt.cpp
index facbec375a..cde30278b3 100644
--- a/examples/demos/minehunt/minehunt.cpp
+++ b/examples/demos/minehunt/minehunt.cpp
@@ -45,25 +45,25 @@
#include "minehunt.h"
-void tilesPropAppend(QDeclarativeListProperty<TileData>* prop, TileData* value)
+void tilesPropAppend(QQmlListProperty<TileData>* prop, TileData* value)
{
Q_UNUSED(prop);
Q_UNUSED(value);
return; //Append not supported
}
-int tilesPropCount(QDeclarativeListProperty<TileData>* prop)
+int tilesPropCount(QQmlListProperty<TileData>* prop)
{
return static_cast<QList<TileData*>*>(prop->data)->count();
}
-TileData* tilesPropAt(QDeclarativeListProperty<TileData>* prop, int index)
+TileData* tilesPropAt(QQmlListProperty<TileData>* prop, int index)
{
return static_cast<QList<TileData*>*>(prop->data)->at(index);
}
-QDeclarativeListProperty<TileData> MinehuntGame::tiles(){
- return QDeclarativeListProperty<TileData>(this, &_tiles, &tilesPropAppend,
+QQmlListProperty<TileData> MinehuntGame::tiles(){
+ return QQmlListProperty<TileData>(this, &_tiles, &tilesPropAppend,
&tilesPropCount, &tilesPropAt, 0);
}
diff --git a/examples/demos/minehunt/minehunt.h b/examples/demos/minehunt/minehunt.h
index a0ae23fa8a..34bab71218 100644
--- a/examples/demos/minehunt/minehunt.h
+++ b/examples/demos/minehunt/minehunt.h
@@ -40,7 +40,7 @@
****************************************************************************/
-#include <qdeclarative.h>
+#include <qqml.h>
class TileData : public QObject
{
@@ -85,8 +85,8 @@ class MinehuntGame : public QObject
public:
MinehuntGame();
- Q_PROPERTY(QDeclarativeListProperty<TileData> tiles READ tiles CONSTANT)
- QDeclarativeListProperty<TileData> tiles();
+ Q_PROPERTY(QQmlListProperty<TileData> tiles READ tiles CONSTANT)
+ QQmlListProperty<TileData> tiles();
Q_PROPERTY(bool isPlaying READ isPlaying NOTIFY isPlayingChanged)
bool isPlaying() {return playing;}
diff --git a/examples/demos/minehunt/minehunt.pro b/examples/demos/minehunt/minehunt.pro
index 81b6b80486..78e874d805 100644
--- a/examples/demos/minehunt/minehunt.pro
+++ b/examples/demos/minehunt/minehunt.pro
@@ -1,4 +1,4 @@
-QT += declarative quick
+QT += qml quick
HEADERS += minehunt.h
SOURCES += main.cpp minehunt.cpp
diff --git a/examples/demos/minehunt/minehunt.qml b/examples/demos/minehunt/minehunt.qml
index 7c4948a3bb..42dc408fff 100644
--- a/examples/demos/minehunt/minehunt.qml
+++ b/examples/demos/minehunt/minehunt.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage