10 files changed, 13 insertions, 11 deletions
diff --git a/demos/declarative/calculator/main.cpp b/demos/declarative/calculator/main.cpp
index cb79f857..1ba16cae 100644
--- a/demos/declarative/calculator/main.cpp
+++ b/demos/declarative/calculator/main.cpp
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 #include "qmlapplicationviewer.h"
-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
 #include <QtCore/QDebug>
 
 Q_DECL_EXPORT int main(int argc, char *argv[])
diff --git a/demos/declarative/flickr/main.cpp b/demos/declarative/flickr/main.cpp
index ab5ad2b9..5cc4e047 100644
--- a/demos/declarative/flickr/main.cpp
+++ b/demos/declarative/flickr/main.cpp
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 #include "qmlapplicationviewer.h"
-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
 
 Q_DECL_EXPORT int main(int argc, char *argv[])
 {
diff --git a/demos/declarative/minehunt/main.cpp b/demos/declarative/minehunt/main.cpp
index 8d3c5457..2089703d 100644
--- a/demos/declarative/minehunt/main.cpp
+++ b/demos/declarative/minehunt/main.cpp
@@ -41,9 +41,9 @@
 
 #include "qmlapplicationviewer.h"
 #include "minehunt.h"
-#include <QtGui/QApplication>
-#include <QtDeclarative/QDeclarativeContext>
-#include <QtDeclarative/QDeclarativeEngine>
+#include <QtWidgets/QApplication>
+#include <QtQuick1/QDeclarativeContext>
+#include <QtQuick1/QDeclarativeEngine>
 
 int main(int argc, char *argv[])
 {
diff --git a/demos/declarative/minehunt/minehunt.pro b/demos/declarative/minehunt/minehunt.pro
index 5c0b7078..29af4ccb 100644
--- a/demos/declarative/minehunt/minehunt.pro
+++ b/demos/declarative/minehunt/minehunt.pro
@@ -20,6 +20,8 @@ symbian:{
     TARGET.EPOCALLOWDLLDATA = 1
     TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
     include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
+    qmlminehuntfiles.files = MinehuntCore minehunt.qml
+    DEPLOYMENT += qmlminehuntfiles
 }
 
 # Allow network access on Symbian
diff --git a/demos/declarative/photoviewer/main.cpp b/demos/declarative/photoviewer/main.cpp
index e0988bac..9632fe72 100644
--- a/demos/declarative/photoviewer/main.cpp
+++ b/demos/declarative/photoviewer/main.cpp
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 #include "qmlapplicationviewer.h"
-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
 
 Q_DECL_EXPORT int main(int argc, char *argv[])
 {
diff --git a/demos/declarative/rssnews/main.cpp b/demos/declarative/rssnews/main.cpp
index d3f6026e..862834fe 100644
--- a/demos/declarative/rssnews/main.cpp
+++ b/demos/declarative/rssnews/main.cpp
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 #include "qmlapplicationviewer.h"
-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
 
 Q_DECL_EXPORT int main(int argc, char *argv[])
 {
diff --git a/demos/declarative/samegame/main.cpp b/demos/declarative/samegame/main.cpp
index 819e86b1..6ef94e85 100644
--- a/demos/declarative/samegame/main.cpp
+++ b/demos/declarative/samegame/main.cpp
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 #include "qmlapplicationviewer.h"
-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
 
 Q_DECL_EXPORT int main(int argc, char *argv[])
 {
diff --git a/demos/declarative/snake/main.cpp b/demos/declarative/snake/main.cpp
index cd2b5126..11241cf4 100644
--- a/demos/declarative/snake/main.cpp
+++ b/demos/declarative/snake/main.cpp
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 #include "qmlapplicationviewer.h"
-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
 
 Q_DECL_EXPORT int main(int argc, char *argv[])
 {
diff --git a/demos/declarative/twitter/main.cpp b/demos/declarative/twitter/main.cpp
index 0599f316..24948847 100644
--- a/demos/declarative/twitter/main.cpp
+++ b/demos/declarative/twitter/main.cpp
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 #include "qmlapplicationviewer.h"
-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
 
 Q_DECL_EXPORT int main(int argc, char *argv[])
 {
diff --git a/demos/declarative/webbrowser/main.cpp b/demos/declarative/webbrowser/main.cpp
index abbfd04f..1b59d853 100644
--- a/demos/declarative/webbrowser/main.cpp
+++ b/demos/declarative/webbrowser/main.cpp
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 #include "qmlapplicationviewer.h"
-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
 
 Q_DECL_EXPORT int main(int argc, char *argv[])
 {