diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 10:21:53 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 10:22:22 +0200 |
| commit | ce5ac7d67b59deb7c0e261e9ee21a475e6cb2e41 (patch) | |
| tree | ed4dcec9a0e9002156e085ffb6715436bc2e27c5 /examples/declarative/minehunt | |
| parent | f828bee19dee73246c09af3aad913b5540f1cbd0 (diff) | |
| parent | 63952084c085202e7eddca6840c518d8e07445d0 (diff) | |
Merge branch 'refactor'
Conflicts:
src/declarative/items/context2d/qsgcanvasitem.cpp
src/declarative/items/context2d/qsgcontext2d.cpp
src/declarative/items/context2d/qsgcontext2d_p_p.h
src/declarative/particles/qsgcustomparticle.cpp
src/declarative/particles/qsgparticlesystem.cpp
Change-Id: I24e81d3652368c5031305ffa7f969f9f2c249c6c
Diffstat (limited to 'examples/declarative/minehunt')
| -rw-r--r-- | examples/declarative/minehunt/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/declarative/minehunt/main.cpp b/examples/declarative/minehunt/main.cpp index 1f77efe543..2ae2cc0558 100644 --- a/examples/declarative/minehunt/main.cpp +++ b/examples/declarative/minehunt/main.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtGui/QGuiApplication> #include <qsgview.h> #include <QtDeclarative/QDeclarativeContext> #include <QtDeclarative/QDeclarativeEngine> @@ -48,7 +48,7 @@ int main(int argc, char *argv[]) { - QApplication app(argc, argv); + QGuiApplication app(argc, argv); QSGView canvas; qmlRegisterType<TileData>(); |