Make Qt3D buildable without widgets or opengl.

Pull out all references to QGLContext, and QGLWidget and so on; and
replace with the equivalent from the gui library.  Where there is no
equivalent, eg the BindOptions enum, then reimplement.

Also get rid of the harmattan and symbian packaging goop.  This had
become completely unmaintainable, and was making it very hard to see
what dependencies were being pull in by the various parts of the build
system.  In order to have any confidence that conditional compilation
would not add in some problematic dependency, clean all this up.

Task-number: QTBUG-23299
Change-Id: Ied92ca1397076986e455674b064d8540bb13c0df
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>

49 files changed, 53 insertions, 269 deletions

diff --git a/demos/qt3d/cubehouse/cubehouse.desktop b/demos/qt3d/cubehouse/cubehouse.desktop
deleted file mode 100644
index 1a530fa21..000000000
--- a/demos/qt3d/cubehouse/cubehouse.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=CubeHouse
-Icon=icon-l-qt3d
-Exec=/usr/bin/cubehouse -fullscreen
-OnlyShowIn=X-MeeGo;
-X-MeeGo-Logical-Id=qtn_comm_appname_cubehouse
-X-MeeGo-Translation-Catalog=essentials
diff --git a/demos/qt3d/cubehouse/cubehouse.pro b/demos/qt3d/cubehouse/cubehouse.pro
index 46eda3d2d..a0b95465a 100644
--- a/demos/qt3d/cubehouse/cubehouse.pro
+++ b/demos/qt3d/cubehouse/cubehouse.pro
@@ -1,10 +1,7 @@
 TEMPLATE = app
 TARGET = cubehouse
 CONFIG += qt warn_on
-QT += widgets qt3d
-
-CONFIG += qt3d_deploy_pkg
-include(../../../pkg.pri)
+QT += qt3d
 
 SOURCES = cubeview.cpp main.cpp projectivetextureeffect.cpp
 HEADERS = cubeview.h projectivetextureeffect.h
diff --git a/demos/qt3d/cubehouse/icon-l-qt3d.png b/demos/qt3d/cubehouse/icon-l-qt3d.png
deleted file mode 100644
index 07cc4092d..000000000
--- a/demos/qt3d/cubehouse/icon-l-qt3d.png
+++ /dev/null
diff --git a/demos/qt3d/cubehouse/m5-cubehouse.desktop b/demos/qt3d/cubehouse/m5-cubehouse.desktop
deleted file mode 100644
index 9b1bd54a1..000000000
--- a/demos/qt3d/cubehouse/m5-cubehouse.desktop
+++ /dev/null
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Name=CubeHouse
-Comment=Qt3D example application
-Exec=/usr/bin/cubehouse -fullscreen
-Icon=icon-l-qt3d
-Terminal=false
-Type=Application
-Categories=Development;
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
-X-Text-Domain=qt3d
-
diff --git a/demos/qt3d/cubehouse/main.cpp b/demos/qt3d/cubehouse/main.cpp
index 2b9e0a9f9..37ec6e7a3 100644
--- a/demos/qt3d/cubehouse/main.cpp
+++ b/demos/qt3d/cubehouse/main.cpp
@@ -39,12 +39,13 @@
 **
 ****************************************************************************/
 
-#include <QApplication>
+#include <QGuiApplication>
+
 #include "cubeview.h"
 
 int main(int argc, char *argv[])
 {
-    QApplication app(argc, argv);
+    QGuiApplication app(argc, argv);
     CubeView view;
 
     QStringList args = QCoreApplication::arguments();
diff --git a/demos/qt3d/cubehouse/projectivetextureeffect.cpp b/demos/qt3d/cubehouse/projectivetextureeffect.cpp
index 07bb4f5d7..1a63ac850 100644
--- a/demos/qt3d/cubehouse/projectivetextureeffect.cpp
+++ b/demos/qt3d/cubehouse/projectivetextureeffect.cpp
@@ -41,7 +41,8 @@
 
 #include <QFile>
 #include "projectivetextureeffect.h"
-#include <QtOpenGL/qglshaderprogram.h>
+
+#include <QOpenGLShaderProgram>
 
 static const QMatrix4x4 biasMatrix = QMatrix4x4(0.5, 0.0, 0.0, 0.5,
                                          0.0, 0.5, 0.0, 0.5,
diff --git a/demos/qt3d/pageflip/icon-l-qt3d.png b/demos/qt3d/pageflip/icon-l-qt3d.png
deleted file mode 100644
index 07cc4092d..000000000
--- a/demos/qt3d/pageflip/icon-l-qt3d.png
+++ /dev/null
diff --git a/demos/qt3d/pageflip/m5-pageflip.desktop b/demos/qt3d/pageflip/m5-pageflip.desktop
deleted file mode 100644
index 772a3f628..000000000
--- a/demos/qt3d/pageflip/m5-pageflip.desktop
+++ /dev/null
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Name=Pageflip
-Comment=Qt3D example application
-Exec=/usr/bin/pageflip -fullscreen
-Icon=icon-l-qt3d
-Terminal=false
-Type=Application
-Categories=Development;
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
-X-Text-Domain=qt3d
-
diff --git a/demos/qt3d/pageflip/pageflip.cpp b/demos/qt3d/pageflip/pageflip.cpp
index 7dcbdad2d..f96df2517 100644
--- a/demos/qt3d/pageflip/pageflip.cpp
+++ b/demos/qt3d/pageflip/pageflip.cpp
@@ -39,16 +39,18 @@
 **
 ****************************************************************************/
 
-#include <QApplication>
+#include <QGuiApplication>
 #include <QTimer>
 #include <QMouseEvent>
 #include <QWindow>
+#include <QOpenGLContext>
+#include <QOpenGLShaderProgram>
+
 #include "qglpainter.h"
 #include "qglabstracteffect.h"
 #include "qgltexture2d.h"
 #include "qglshaderprogrameffect.h"
-#include <QtGui/QOpenGLContext>
-#include <QtOpenGL/qglshaderprogram.h>
+
 #include "pageflipmath_p.h"
 
 class PageFlipGradientEffect;
@@ -359,7 +361,7 @@ void PageFlipView::update()
     if (!updateQueued)
     {
         updateQueued = true;
-        QApplication::postEvent(this, new QExposeEvent(geometry()));
+        QGuiApplication::postEvent(this, new QExposeEvent(geometry()));
     }
 }
 
@@ -435,7 +437,7 @@ inline void PageFlipView::ensureContext()
 
 int main(int argc, char *argv[])
 {
-    QApplication app(argc, argv);
+    QGuiApplication app(argc, argv);
     PageFlipView view;
 
     QStringList args = QCoreApplication::arguments();
diff --git a/demos/qt3d/pageflip/pageflip.desktop b/demos/qt3d/pageflip/pageflip.desktop
deleted file mode 100644
index 5b75c596f..000000000
--- a/demos/qt3d/pageflip/pageflip.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Pageflip
-Icon=icon-l-qt3d
-Exec=/usr/bin/pageflip -fullscreen
-OnlyShowIn=X-MeeGo;
-X-MeeGo-Logical-Id=qtn_comm_appname_pageflip
-X-MeeGo-Translation-Catalog=essentials
diff --git a/demos/qt3d/pageflip/pageflip.pro b/demos/qt3d/pageflip/pageflip.pro
index 9a49941dc..de95caaa6 100644
--- a/demos/qt3d/pageflip/pageflip.pro
+++ b/demos/qt3d/pageflip/pageflip.pro
@@ -1,7 +1,7 @@
 TEMPLATE = app
 TARGET = pageflip
 CONFIG += qt warn_on
-QT += widgets qt3d
+QT += qt3d
 
 SOURCES = pageflip.cpp pageflipmath.cpp
 HEADERS = pageflipmath_p.h
diff --git a/demos/qt3d/pageflip/pageflipmath_p.h b/demos/qt3d/pageflip/pageflipmath_p.h
index 6ee391f54..586dd9af5 100644
--- a/demos/qt3d/pageflip/pageflipmath_p.h
+++ b/demos/qt3d/pageflip/pageflipmath_p.h
@@ -42,7 +42,9 @@
 #ifndef PAGEFLIPMATH_P_H
 #define PAGEFLIPMATH_P_H
 
-#include <QtOpenGL/qgl.h>
+#include <QtGlobal>
+#include <QRect>
+#include <QOpenGLBuffer>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/demos/qt3d/photobrowser3d/bytereader.cpp b/demos/qt3d/photobrowser3d/bytereader.cpp
index 3274a71a4..9fdcf72f7 100644
--- a/demos/qt3d/photobrowser3d/bytereader.cpp
+++ b/demos/qt3d/photobrowser3d/bytereader.cpp
@@ -49,6 +49,7 @@
 #include <QUrl>
 #include <QFile>
 #include <QCoreApplication>
+#include <QPainter>
 
 ByteReader::ByteReader()
     : m_stop(0), m_loading(0)
diff --git a/demos/qt3d/photobrowser3d/icon-l-qt3d.png b/demos/qt3d/photobrowser3d/icon-l-qt3d.png
deleted file mode 100644
index 07cc4092d..000000000
--- a/demos/qt3d/photobrowser3d/icon-l-qt3d.png
+++ /dev/null
diff --git a/demos/qt3d/photobrowser3d/imagedisplay.cpp b/demos/qt3d/photobrowser3d/imagedisplay.cpp
index 924a2f973..27651a71c 100644
--- a/demos/qt3d/photobrowser3d/imagedisplay.cpp
+++ b/demos/qt3d/photobrowser3d/imagedisplay.cpp
@@ -51,8 +51,9 @@
 #include "qphotobrowser3dscene.h"
 #include "photobrowser3dview.h"
 
-#include <QApplication>
+#include <QGuiApplication>
 #include <QChildEvent>
+#include <QCloseEvent>
 #include <QUrl>
 #include <QImage>
 
@@ -156,7 +157,7 @@ ImageDisplay::ImageDisplay(QObject *parent, QGLMaterialCollection *materials, qr
     m_frameImage = qMakeFrameImage();
     mat = new QGLMaterial();
     tex = new QGLTexture2D(mat);
-    tex->setHorizontalWrap(QGL::Clamp);
+    tex->setHorizontalWrap(QGL::ClampToEdge);
     tex->setImage(m_frameImage);
     mat->setTexture(tex);
     mat->setObjectName("loading image material - default");
diff --git a/demos/qt3d/photobrowser3d/imagedisplay.h b/demos/qt3d/photobrowser3d/imagedisplay.h
index 44f8421c4..a2410d9bf 100644
--- a/demos/qt3d/photobrowser3d/imagedisplay.h
+++ b/demos/qt3d/photobrowser3d/imagedisplay.h
@@ -46,6 +46,7 @@
 #include "qglmaterialcollection.h"
 
 #include <QString>
+#include <QImage>
 
 QT_BEGIN_NAMESPACE
 class QGLBuilder;
diff --git a/demos/qt3d/photobrowser3d/m5-photobrowser3d.desktop b/demos/qt3d/photobrowser3d/m5-photobrowser3d.desktop
deleted file mode 100644
index 54efc5f88..000000000
--- a/demos/qt3d/photobrowser3d/m5-photobrowser3d.desktop
+++ /dev/null
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Name=Photobrowser
-Comment=Qt3D example application
-Exec=/usr/bin/photobrowser3d -fullscreen
-Icon=icon-l-qt3d
-Terminal=false
-Type=Application
-Categories=Development;
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
-X-Text-Domain=qt3d
-
diff --git a/demos/qt3d/photobrowser3d/main.cpp b/demos/qt3d/photobrowser3d/main.cpp
index 63886bc51..7537495a3 100644
--- a/demos/qt3d/photobrowser3d/main.cpp
+++ b/demos/qt3d/photobrowser3d/main.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets/QApplication>
-#include <QtCore/QThread>
+#include <QGuiApplication>
+#include <QThread>
 
 #include "photobrowser3dview.h"
 
@@ -48,7 +48,7 @@ int main(int argc, char *argv[])
 {
     Q_INIT_RESOURCE(photobrowser3d);
 
-    QApplication app(argc, argv);
+    QGuiApplication app(argc, argv);
 
     // for QSettings
     QCoreApplication::setOrganizationName("Nokia");
diff --git a/demos/qt3d/photobrowser3d/photobrowser3d.desktop b/demos/qt3d/photobrowser3d/photobrowser3d.desktop
deleted file mode 100644
index 747c80973..000000000
--- a/demos/qt3d/photobrowser3d/photobrowser3d.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Photobrowser 3D
-Icon=icon-l-qt3d
-Exec=/usr/bin/photobrowser3d -fullscreen
-OnlyShowIn=X-MeeGo;
-X-MeeGo-Logical-Id=qtn_comm_appname_photobrowser3d
-X-MeeGo-Translation-Catalog=essentials
diff --git a/demos/qt3d/photobrowser3d/photobrowser3d.pro b/demos/qt3d/photobrowser3d/photobrowser3d.pro
index 37c7275f7..cf03b7605 100644
--- a/demos/qt3d/photobrowser3d/photobrowser3d.pro
+++ b/demos/qt3d/photobrowser3d/photobrowser3d.pro
@@ -1,10 +1,8 @@
 TEMPLATE = app
 TARGET = photobrowser3d
 CONFIG += qt warn_on
-QT += widgets
 
-include(../../../pkg.pri)
-QT += qt3d opengl
+QT += qt3d
 
 SOURCES += main.cpp\
     photobrowser3dview.cpp \
@@ -56,9 +54,6 @@ OTHER_FILES += \
     shaders/replace_texture.fsh \
     shaders/replace_texture.vsh
 
-CONFIG += qt3d_deploy_pkg
-include(../../../pkg.pri)
-
 OTHER_FILES += \
     photobrowser.rc
 
diff --git a/demos/qt3d/photobrowser3d/photobrowser3dview.cpp b/demos/qt3d/photobrowser3d/photobrowser3dview.cpp
index cee7d8817..25520bd5d 100644
--- a/demos/qt3d/photobrowser3d/photobrowser3dview.cpp
+++ b/demos/qt3d/photobrowser3d/photobrowser3dview.cpp
@@ -53,8 +53,7 @@
 #include "pancontroller.h"
 #include "thumbnailnode.h"
 
-#include <QApplication>
-#include <QDesktopWidget>
+#include <QGuiApplication>
 #include <QWheelEvent>
 #include <QDir>
 #include <QTimer>
@@ -328,7 +327,7 @@ void PhotoBrowser3DView::waitForExit()
     }
 }
 
-void PhotoBrowser3DView::closeEvent(QCloseEvent *e)
+void PhotoBrowser3DView::hideEvent(QHideEvent *e)
 {
     if (m_images)
     {
diff --git a/demos/qt3d/photobrowser3d/photobrowser3dview.h b/demos/qt3d/photobrowser3d/photobrowser3dview.h
index f095ff708..0abd2ac62 100644
--- a/demos/qt3d/photobrowser3d/photobrowser3dview.h
+++ b/demos/qt3d/photobrowser3d/photobrowser3dview.h
@@ -79,7 +79,7 @@ protected:
     void resizeGL(int w, int h);
     void wheelEvent(QWheelEvent *e);
     void keyPressEvent(QKeyEvent *e);
-    void closeEvent(QCloseEvent *e);
+    void hideEvent(QHideEvent *e);
     void mousePressEvent(QMouseEvent *e);
 private slots:
     void initialise();
diff --git a/demos/qt3d/photobrowser3d/qatlas.cpp b/demos/qt3d/photobrowser3d/qatlas.cpp
index d52a3cfe3..13a36b4ff 100644
--- a/demos/qt3d/photobrowser3d/qatlas.cpp
+++ b/demos/qt3d/photobrowser3d/qatlas.cpp
@@ -51,8 +51,8 @@
 
 #include <QImage>
 #include <QThread>
-#include <QGLFramebufferObject>
-#include <QGLFramebufferObjectFormat>
+#include <QOpenGLFramebufferObject>
+#include <QOpenGLFramebufferObjectFormat>
 #include <QCoreApplication>
 
 #ifndef GL_MULTISAMPLE
diff --git a/demos/qt3d/photobrowser3d/qatlas.h b/demos/qt3d/photobrowser3d/qatlas.h
index f1bca7b2e..d5bec38f4 100644
--- a/demos/qt3d/photobrowser3d/qatlas.h
+++ b/demos/qt3d/photobrowser3d/qatlas.h
@@ -43,7 +43,8 @@
 #define QATLAS_H
 
 #include <QSize>
-#include <QtGui/QOpenGLFramebufferObject>
+#include <QOpenGLFramebufferObject>
+#include <QImage>
 
 #include "qarray.h"
 #include "qgeometrydata.h"
@@ -53,7 +54,7 @@ class QAreaAllocator;
 class QGLTexture2D;
 class QGLMaterial;
 class QGeometryData;
-class QGLFramebufferObject;
+class QOpenGLFramebufferObject;
 class QGLFramebufferObjectSurface;
 QT_END_NAMESPACE
 
diff --git a/demos/qt3d/photobrowser3d/thumbnaileffect.cpp b/demos/qt3d/photobrowser3d/thumbnaileffect.cpp
index ab5c96d25..21a96fb1a 100644
--- a/demos/qt3d/photobrowser3d/thumbnaileffect.cpp
+++ b/demos/qt3d/photobrowser3d/thumbnaileffect.cpp
@@ -41,7 +41,7 @@
 
 #include "thumbnaileffect.h"
 
-#include <QtOpenGL/qglshaderprogram.h>
+#include <QOpenGLShaderProgram>
 
 class ThumbnailEffectPrivate
 {
@@ -56,7 +56,7 @@ public:
     }
     ~ThumbnailEffectPrivate() { delete program; }
 
-    QGLShaderProgram *program;
+    QOpenGLShaderProgram *program;
     int matrixUniform;
     int thumbnailUniform;
     int colorUniform;
@@ -103,9 +103,9 @@ void ThumbnailEffect::setActive(QGLPainter *painter, bool flag)
     if (!d->program) {
         if (!flag)
             return;
-        d->program = new QGLShaderProgram();
-        d->program->addShaderFromSourceFile(QGLShader::Vertex, ":/shaders/replace_texture.vsh");
-        d->program->addShaderFromSourceFile(QGLShader::Fragment, ":/shaders/replace_texture.fsh");
+        d->program = new QOpenGLShaderProgram();
+        d->program->addShaderFromSourceFile(QOpenGLShader::Vertex, ":/shaders/replace_texture.vsh");
+        d->program->addShaderFromSourceFile(QOpenGLShader::Fragment, ":/shaders/replace_texture.fsh");
         d->program->bindAttributeLocation("vertex", QGL::Position);
         d->program->bindAttributeLocation("texcoord", QGL::TextureCoord0);
         d->program->bindAttributeLocation("thumbcoord", QGL::TextureCoord1);
diff --git a/demos/qt3d/shapes/icon-l-qt3d.png b/demos/qt3d/shapes/icon-l-qt3d.png
deleted file mode 100644
index 07cc4092d..000000000
--- a/demos/qt3d/shapes/icon-l-qt3d.png
+++ /dev/null
diff --git a/demos/qt3d/shapes/m5-shapes.desktop b/demos/qt3d/shapes/m5-shapes.desktop
deleted file mode 100644
index e3ef575d7..000000000
--- a/demos/qt3d/shapes/m5-shapes.desktop
+++ /dev/null
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Name=Shapes
-Comment=Qt3D example application
-Exec=/usr/bin/shapes -fullscreen
-Icon=icon-l-qt3d
-Terminal=false
-Type=Application
-Categories=Development;
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
-X-Text-Domain=qt3d
-
diff --git a/demos/qt3d/shapes/shapes.cpp b/demos/qt3d/shapes/shapes.cpp
index 67c821ec3..ee73e42be 100644
--- a/demos/qt3d/shapes/shapes.cpp
+++ b/demos/qt3d/shapes/shapes.cpp
@@ -46,15 +46,16 @@
 #include "qglcamera.h"
 #include "qgltexture2d.h"
 #include "qglsubsurface.h"
-#include <QApplication>
+
+#include <QGuiApplication>
 #include <QImage>
 #include <QPainter>
 #include <QDebug>
 #include <QtGui/QFontDatabase>
 
-#include <QtGui/QWindow>
-#include <QtGui/QOpenGLContext>
-#include <QtGui/QSurfaceFormat>
+#include <QWindow>
+#include <QOpenGLContext>
+#include <QSurfaceFormat>
 
 class ShapesWidget : public QWindow
 {
@@ -412,7 +413,7 @@ void ShapesWidget::paintTeapot(QGLPainter *painter, const QRect& rect)
 void ShapesWidget::drawText
         (QGLPainter *painter, const QRect& posn, const QString& str)
 {
-    QFont f = QApplication::font();
+    QFont f = QGuiApplication::font();
     QFontMetrics metrics(f);
     QRect rect = metrics.boundingRect(str);
     rect.adjust(0, 0, 1, 1);
@@ -483,7 +484,7 @@ void ShapesWidget::ensureContext()
 
 int main(int argc, char *argv[])
 {
-    QApplication app(argc, argv);
+    QGuiApplication app(argc, argv);
     ShapesWidget view;
 
     QStringList args = QCoreApplication::arguments();
diff --git a/demos/qt3d/shapes/shapes.desktop b/demos/qt3d/shapes/shapes.desktop
deleted file mode 100644
index 7a841e128..000000000
--- a/demos/qt3d/shapes/shapes.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=shapes
-Icon=icon-l-qt3d
-Exec=/usr/bin/shapes -fullscreen
-OnlyShowIn=X-MeeGo;
-X-MeeGo-Logical-Id=qtn_comm_appname_shapes
-X-MeeGo-Translation-Catalog=essentials
diff --git a/demos/qt3d/shapes/shapes.pro b/demos/qt3d/shapes/shapes.pro
index bebc7157a..6453350d9 100644
--- a/demos/qt3d/shapes/shapes.pro
+++ b/demos/qt3d/shapes/shapes.pro
@@ -1,13 +1,10 @@
 TEMPLATE = app
 TARGET = shapes
 CONFIG += qt warn_on
-QT += widgets qt3d
+QT += qt3d
 
 SOURCES = shapes.cpp
 
-CONFIG += qt3d_deploy_pkg
-include(../../../pkg.pri)
-
 OTHER_FILES += \
     shapes.rc
 
diff --git a/demos/qt3d/teaservice/icon-l-qt3d.png b/demos/qt3d/teaservice/icon-l-qt3d.png
deleted file mode 100644
index 07cc4092d..000000000
--- a/demos/qt3d/teaservice/icon-l-qt3d.png
+++ /dev/null
diff --git a/demos/qt3d/teaservice/m5-teaservice.desktop b/demos/qt3d/teaservice/m5-teaservice.desktop
deleted file mode 100644
index be3e241a3..000000000
--- a/demos/qt3d/teaservice/m5-teaservice.desktop
+++ /dev/null
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Name=Tea Service
-Comment=Qt3D example application
-Exec=/usr/bin/teaservice -fullscreen
-Icon=icon-l-qt3d
-Terminal=false
-Type=Application
-Categories=Development;
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
-X-Text-Domain=qt3d
-
diff --git a/demos/qt3d/teaservice/teaservice.cpp b/demos/qt3d/teaservice/teaservice.cpp
index 9220cbec3..624de974c 100644
--- a/demos/qt3d/teaservice/teaservice.cpp
+++ b/demos/qt3d/teaservice/teaservice.cpp
@@ -39,14 +39,10 @@
 **
 ****************************************************************************/
 
-#include <QApplication>
-#include <QMainWindow>
-#include <QMenu>
-#include <QMenuBar>
+#include <QGuiApplication>
 #include <QKeyEvent>
-#include <QAction>
 #include <QDebug>
-#include <QtCore/QTimer>
+#include <QTimer>
 
 #include "qglview.h"
 #include "meshobject.h"
@@ -347,10 +343,10 @@ void TeaServiceView::keyPressEvent(QKeyEvent *e)
 
 int main(int argc, char *argv[])
 {
-    QApplication app(argc, argv);
+    QGuiApplication app(argc, argv);
 
     TeaServiceView view;
-    QStringList args = QCoreApplication::arguments();
+    QStringList args = QGuiApplication::arguments();
     int w_pos = args.indexOf("-width");
     int h_pos = args.indexOf("-height");
     if (w_pos >= 0 && h_pos >= 0)
diff --git a/demos/qt3d/teaservice/teaservice.desktop b/demos/qt3d/teaservice/teaservice.desktop
deleted file mode 100644
index 2d49ae2f6..000000000
--- a/demos/qt3d/teaservice/teaservice.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Tea Service
-Icon=icon-l-qt3d
-Exec=/usr/bin/teaservice -fullscreen
-OnlyShowIn=X-MeeGo;
-X-MeeGo-Logical-Id=qtn_comm_appname_teaservice
-X-MeeGo-Translation-Catalog=essentials
diff --git a/demos/qt3d/teaservice/teaservice.pro b/demos/qt3d/teaservice/teaservice.pro
index 650fe030e..c2a653106 100644
--- a/demos/qt3d/teaservice/teaservice.pro
+++ b/demos/qt3d/teaservice/teaservice.pro
@@ -1,18 +1,13 @@
 TEMPLATE = app
 TARGET = teaservice
 CONFIG += qt warn_on
-QT += widgets
 
-include(../../../pkg.pri)
 QT += qt3d
 
 SOURCES = teaservice.cpp meshobject.cpp sceneobject.cpp perpixeleffect.cpp
 HEADERS = meshobject.h sceneobject.h perpixeleffect.h
 RESOURCES = teaservice.qrc
 
-CONFIG += qt3d_deploy_pkg
-include(../../../pkg.pri)
-
 OTHER_FILES += \
     teaservice.rc
 
diff --git a/demos/quick3d/flickr3d/flickr3d.pro b/demos/quick3d/flickr3d/flickr3d.pro
index 24303e947..e37c7456d 100644
--- a/demos/quick3d/flickr3d/flickr3d.pro
+++ b/demos/quick3d/flickr3d/flickr3d.pro
@@ -8,10 +8,6 @@ SOURCES += main.cpp
 INSTALL_DIRS = qml
 mt: INSTALL_FILES = mt.qml
 
-CONFIG += qt3d_deploy_qml
-include(../../../pkg.pri)
-qtcAddDeployment()
-
 OTHER_FILES += \
     flickr3d.rc
 
diff --git a/demos/quick3d/flickr3d/m5-robo_bounce.desktop b/demos/quick3d/flickr3d/m5-robo_bounce.desktop
deleted file mode 100644
index 709103d57..000000000
--- a/demos/quick3d/flickr3d/m5-robo_bounce.desktop
+++ /dev/null
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Name=RoboBounce
-Comment=Qt3D example application
-Exec=/usr/bin/robo_bounce -fullscreen
-Icon=icon-l-qtquick3d
-Terminal=false
-Type=Application
-Categories=Development;
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
-X-Text-Domain=qt3d
-
diff --git a/demos/quick3d/model_viewer/icon-l-qtquick3d.png b/demos/quick3d/model_viewer/icon-l-qtquick3d.png
deleted file mode 100644
index 69deef3f6..000000000
--- a/demos/quick3d/model_viewer/icon-l-qtquick3d.png
+++ /dev/null
diff --git a/demos/quick3d/model_viewer/m5-model_viewer.desktop b/demos/quick3d/model_viewer/m5-model_viewer.desktop
deleted file mode 100644
index 10a860f7f..000000000
--- a/demos/quick3d/model_viewer/m5-model_viewer.desktop
+++ /dev/null
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Name=Model Viewer
-Comment=Qt3D example application
-Exec=/usr/bin/model_viewer -fullscreen
-Icon=icon-l-qtquick3d
-Terminal=false
-Type=Application
-Categories=Development;
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
-X-Text-Domain=qt3d
-
diff --git a/demos/quick3d/model_viewer/model_viewer.desktop b/demos/quick3d/model_viewer/model_viewer.desktop
deleted file mode 100644
index a89b4f09e..000000000
--- a/demos/quick3d/model_viewer/model_viewer.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Model Viewer
-Icon=icon-l-qtquick3d
-Exec=/usr/bin/model_viewer -fullscreen
-OnlyShowIn=X-MeeGo;
-X-MeeGo-Logical-Id=qtn_comm_appname_model_viewer
-X-MeeGo-Translation-Catalog=essentials
diff --git a/demos/quick3d/model_viewer/model_viewer.pro b/demos/quick3d/model_viewer/model_viewer.pro
index 1f80e89e2..09d362805 100644
--- a/demos/quick3d/model_viewer/model_viewer.pro
+++ b/demos/quick3d/model_viewer/model_viewer.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 TARGET = model_viewer
-QT += declarative quick widgets
+QT += declarative quick
 CONFIG += qt warn_on
 
 SOURCES += main.cpp
@@ -8,10 +8,6 @@ SOURCES += main.cpp
 INSTALL_DIRS = qml
 mt: INSTALL_FILES = mt.qml
 
-CONFIG += qt3d_deploy_qml
-include(../../../pkg.pri)
-qtcAddDeployment()
-
 OTHER_FILES += \
     model_viewer.rc
 
diff --git a/demos/quick3d/robo_bounce/icon-l-qtquick3d.png b/demos/quick3d/robo_bounce/icon-l-qtquick3d.png
deleted file mode 100644
index 69deef3f6..000000000
--- a/demos/quick3d/robo_bounce/icon-l-qtquick3d.png
+++ /dev/null
diff --git a/demos/quick3d/robo_bounce/m5-robo_bounce.desktop b/demos/quick3d/robo_bounce/m5-robo_bounce.desktop
deleted file mode 100644
index 709103d57..000000000
--- a/demos/quick3d/robo_bounce/m5-robo_bounce.desktop
+++ /dev/null
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Name=RoboBounce
-Comment=Qt3D example application
-Exec=/usr/bin/robo_bounce -fullscreen
-Icon=icon-l-qtquick3d
-Terminal=false
-Type=Application
-Categories=Development;
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
-X-Text-Domain=qt3d
-
diff --git a/demos/quick3d/robo_bounce/robo_bounce.desktop b/demos/quick3d/robo_bounce/robo_bounce.desktop
deleted file mode 100644
index a143dccff..000000000
--- a/demos/quick3d/robo_bounce/robo_bounce.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=RoboBounce
-Icon=icon-l-qtquick3d
-Exec=/usr/bin/robo_bounce -fullscreen
-OnlyShowIn=X-MeeGo;
-X-MeeGo-Logical-Id=qtn_comm_appname_robo_bounce
-X-MeeGo-Translation-Catalog=essentials
diff --git a/demos/quick3d/robo_bounce/robo_bounce.pro b/demos/quick3d/robo_bounce/robo_bounce.pro
index 1b5fc63a5..34e219ef6 100644
--- a/demos/quick3d/robo_bounce/robo_bounce.pro
+++ b/demos/quick3d/robo_bounce/robo_bounce.pro
@@ -7,10 +7,6 @@ SOURCES += main.cpp
 INSTALL_DIRS = qml
 mt: INSTALL_FILES = mt.qml
 
-CONFIG += qt3d_deploy_qml
-include(../../../pkg.pri)
-qtcAddDeployment()
-
 OTHER_FILES += \
     robo_bounce.rc
 
diff --git a/demos/quick3d/tea_service/icon-l-qtquick3d.png b/demos/quick3d/tea_service/icon-l-qtquick3d.png
deleted file mode 100644
index 69deef3f6..000000000
--- a/demos/quick3d/tea_service/icon-l-qtquick3d.png
+++ /dev/null
diff --git a/demos/quick3d/tea_service/m5-tea_service.desktop b/demos/quick3d/tea_service/m5-tea_service.desktop
deleted file mode 100644
index 5281703e7..000000000
--- a/demos/quick3d/tea_service/m5-tea_service.desktop
+++ /dev/null
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Name=Tea Service
-Comment=Qt3D example application
-Exec=/usr/bin/tea_service -fullscreen
-Icon=icon-l-qtquick3d
-Terminal=false
-Type=Application
-Categories=Development;
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
-X-Text-Domain=qt3d
-
diff --git a/demos/quick3d/tea_service/tea_service.desktop b/demos/quick3d/tea_service/tea_service.desktop
deleted file mode 100644
index de9814edb..000000000
--- a/demos/quick3d/tea_service/tea_service.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Tea Service
-Icon=icon-l-qtquick3d
-Exec=/usr/bin/tea_service -fullscreen
-OnlyShowIn=X-MeeGo;
-X-MeeGo-Logical-Id=qtn_comm_appname_tea_service
-X-MeeGo-Translation-Catalog=essentials
diff --git a/demos/quick3d/tea_service/tea_service.pro b/demos/quick3d/tea_service/tea_service.pro
index cd84bebd7..1baead31d 100644
--- a/demos/quick3d/tea_service/tea_service.pro
+++ b/demos/quick3d/tea_service/tea_service.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 TARGET = tea_service
-QT += declarative quick widgets
+QT += declarative quick
 CONFIG += qt warn_on
 
 SOURCES += main.cpp
@@ -8,10 +8,6 @@ SOURCES += main.cpp
 INSTALL_DIRS = qml
 mt: INSTALL_FILES = mt.qml
 
-CONFIG += qt3d_deploy_qml
-include(../../../pkg.pri)
-qtcAddDeployment()
-
 OTHER_FILES += \
     tea_service.rc