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>

5 files changed, 4 insertions, 28 deletions

diff --git a/examples/qt3d/geometry/geometry.desktop b/examples/qt3d/geometry/geometry.desktop
deleted file mode 100644
index 12fb440b3..000000000
--- a/examples/qt3d/geometry/geometry.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=D20 Qt3D
-Icon=icon-l-qt3d
-Exec=/usr/bin/geometry -fullscreen
-OnlyShowIn=X-MeeGo;
-X-MeeGo-Logical-Id=qtn_comm_appname_geometry
-X-MeeGo-Translation-Catalog=essentials
diff --git a/examples/qt3d/geometry/geometry.pro b/examples/qt3d/geometry/geometry.pro
index 401baeec9..204a77268 100644
--- a/examples/qt3d/geometry/geometry.pro
+++ b/examples/qt3d/geometry/geometry.pro
@@ -1,7 +1,7 @@
 TEMPLATE = app
 TARGET = geometry
 CONFIG += qt warn_on
-QT += widgets qt3d
+QT += qt3d
 
 SOURCES = geometryview.cpp \
     main.cpp \
@@ -12,9 +12,6 @@ HEADERS = geometryview.h \
     quadplane.h
 RESOURCES = geometry.qrc
 
-CONFIG += qt3d_deploy_pkg
-include(../../../pkg.pri)
-
 OTHER_FILES += \
     geometry.rc
 
diff --git a/examples/qt3d/geometry/icon-l-qt3d.png b/examples/qt3d/geometry/icon-l-qt3d.png
deleted file mode 100644
index 07cc4092d..000000000
--- a/examples/qt3d/geometry/icon-l-qt3d.png
+++ /dev/null
diff --git a/examples/qt3d/geometry/m5-geometry.desktop b/examples/qt3d/geometry/m5-geometry.desktop
deleted file mode 100644
index 486deff15..000000000
--- a/examples/qt3d/geometry/m5-geometry.desktop
+++ /dev/null
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Name=D20 Qt3D
-Comment=Qt3D example application
-Exec=/usr/bin/geometry -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/examples/qt3d/geometry/main.cpp b/examples/qt3d/geometry/main.cpp
index 1a073130c..78c3d4a24 100644
--- a/examples/qt3d/geometry/main.cpp
+++ b/examples/qt3d/geometry/main.cpp
@@ -38,12 +38,13 @@
 **
 ****************************************************************************/
 
-#include <QApplication>
+#include <QGuiApplication>
+
 #include "geometryview.h"
 
 int main(int argc, char *argv[])
 {
-    QApplication app(argc, argv);
+    QGuiApplication app(argc, argv);
     GeometryView view;
 
     if (view.stereoType() != QGLView::RedCyanAnaglyph)