diff options
author | Sarah Smith <sarah.j.smith@nokia.com> | 2011-12-21 14:45:00 +1000 |
---|---|---|
committer | Sarah Jane Smith <sarah.j.smith@nokia.com> | 2011-12-21 08:57:36 +0100 |
commit | aedf27c0aa3e3d037392335ea96d37e3a9a8b811 (patch) | |
tree | fec10b3fff19f2cb6e0d3640d73a4ebb7a1fe804 /examples/qt3d | |
parent | a7db0a7405e3511ef8a78f0ff1cdb3b1ecd92157 (diff) |
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>
Diffstat (limited to 'examples/qt3d')
52 files changed, 41 insertions, 284 deletions
diff --git a/examples/qt3d/basket/basket.desktop b/examples/qt3d/basket/basket.desktop deleted file mode 100644 index c64ec3dc9..000000000 --- a/examples/qt3d/basket/basket.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Basket -Icon=icon-l-qt3d -Exec=/usr/bin/basket -fullscreen -OnlyShowIn=X-MeeGo; -X-MeeGo-Logical-Id=qtn_comm_appname_basket -X-MeeGo-Translation-Catalog=essentials diff --git a/examples/qt3d/basket/basket.pro b/examples/qt3d/basket/basket.pro index 03d6370b7..4dc471c68 100644 --- a/examples/qt3d/basket/basket.pro +++ b/examples/qt3d/basket/basket.pro @@ -3,9 +3,6 @@ TARGET = basket CONFIG += qt warn_on QT += qt3d -CONFIG += qt3d_deploy_pkg -include(../../../pkg.pri) - SOURCES = basketview.cpp main.cpp HEADERS = basketview.h basket_data.h RESOURCES = basket.qrc diff --git a/examples/qt3d/basket/icon-l-qt3d.png b/examples/qt3d/basket/icon-l-qt3d.png Binary files differdeleted file mode 100644 index 07cc4092d..000000000 --- a/examples/qt3d/basket/icon-l-qt3d.png +++ /dev/null diff --git a/examples/qt3d/basket/m5-basket.desktop b/examples/qt3d/basket/m5-basket.desktop deleted file mode 100644 index b2dff71ab..000000000 --- a/examples/qt3d/basket/m5-basket.desktop +++ /dev/null @@ -1,14 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Name=Basket -Comment=Qt3D example application -Exec=/usr/bin/basket -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/builder/builder.desktop b/examples/qt3d/builder/builder.desktop deleted file mode 100644 index 3cae4d977..000000000 --- a/examples/qt3d/builder/builder.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Builder -Icon=icon-l-qt3d -Exec=/usr/bin/builder -fullscreen -OnlyShowIn=X-MeeGo; -X-MeeGo-Logical-Id=qtn_comm_appname_builder -X-MeeGo-Translation-Catalog=essentials diff --git a/examples/qt3d/builder/builder.pro b/examples/qt3d/builder/builder.pro index f16480aea..a92561a3d 100644 --- a/examples/qt3d/builder/builder.pro +++ b/examples/qt3d/builder/builder.pro @@ -2,16 +2,13 @@ TEMPLATE = app TARGET = builder CONFIG += qt warn_on -QT += widgets qt3d +QT += qt3d SOURCES = builder.cpp \ main.cpp HEADERS = builder.h RESOURCES += builder.qrc -CONFIG += qt3d_deploy_pkg -include(../../../pkg.pri) - OTHER_FILES += \ builder.rc diff --git a/examples/qt3d/builder/icon-l-qt3d.png b/examples/qt3d/builder/icon-l-qt3d.png Binary files differdeleted file mode 100644 index 07cc4092d..000000000 --- a/examples/qt3d/builder/icon-l-qt3d.png +++ /dev/null diff --git a/examples/qt3d/builder/m5-builder.desktop b/examples/qt3d/builder/m5-builder.desktop deleted file mode 100644 index 1c87f8ab3..000000000 --- a/examples/qt3d/builder/m5-builder.desktop +++ /dev/null @@ -1,14 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Name=Builder -Comment=Qt3D example application -Exec=/usr/bin/builder -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/builder/main.cpp b/examples/qt3d/builder/main.cpp index 7bae0038f..f0705c0c2 100644 --- a/examples/qt3d/builder/main.cpp +++ b/examples/qt3d/builder/main.cpp @@ -38,13 +38,13 @@ ** ****************************************************************************/ -#include <QApplication> +#include <QGuiApplication> #include "builder.h" int main(int argc, char *argv[]) { - QApplication app(argc, argv); + QGuiApplication app(argc, argv); BuilderView view; if (view.stereoType() != QGLView::RedCyanAnaglyph) diff --git a/examples/qt3d/cube/cube.desktop b/examples/qt3d/cube/cube.desktop deleted file mode 100644 index 8f26f5d6f..000000000 --- a/examples/qt3d/cube/cube.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Type=Application -Name=cube Qt3D -Icon=icon-l-qt3d -Exec=/usr/bin/cube -fullscreen -OnlyShowIn=X-MeeGo; -X-MeeGo-Logical-Id=qtn_comm_appname_cube -X-MeeGo-Translation-Catalog=essentials diff --git a/examples/qt3d/cube/cube.pro b/examples/qt3d/cube/cube.pro index 5a80109d3..821f3e9da 100644 --- a/examples/qt3d/cube/cube.pro +++ b/examples/qt3d/cube/cube.pro @@ -1,15 +1,12 @@ TEMPLATE = app TARGET = cube CONFIG += qt warn_on -QT += widgets qt3d +QT += qt3d SOURCES = cubeview.cpp main.cpp HEADERS = cubeview.h RESOURCES = cube.qrc -CONFIG += qt3d_deploy_pkg -include(../../../pkg.pri) - OTHER_FILES += \ cube.rc diff --git a/examples/qt3d/cube/icon-l-qt3d.png b/examples/qt3d/cube/icon-l-qt3d.png Binary files differdeleted file mode 100644 index 07cc4092d..000000000 --- a/examples/qt3d/cube/icon-l-qt3d.png +++ /dev/null diff --git a/examples/qt3d/cube/m5-cube.desktop b/examples/qt3d/cube/m5-cube.desktop deleted file mode 100644 index 5fcc35fdf..000000000 --- a/examples/qt3d/cube/m5-cube.desktop +++ /dev/null @@ -1,14 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Name=Cube -Comment=Qt3D example application -Exec=/usr/bin/cube -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/cube/main.cpp b/examples/qt3d/cube/main.cpp index d4c44d7d0..f95ea8b27 100644 --- a/examples/qt3d/cube/main.cpp +++ b/examples/qt3d/cube/main.cpp @@ -38,12 +38,13 @@ ** ****************************************************************************/ -#include <QApplication> +#include <QGuiApplication> + #include "cubeview.h" int main(int argc, char *argv[]) { - QApplication app(argc, argv); + QGuiApplication app(argc, argv); CubeView view; if (view.stereoType() != QGLView::RedCyanAnaglyph) diff --git a/examples/qt3d/cylinder/cylinder.desktop b/examples/qt3d/cylinder/cylinder.desktop deleted file mode 100644 index 49f7198a6..000000000 --- a/examples/qt3d/cylinder/cylinder.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Cappucino -Icon=icon-l-qt3d -Exec=/usr/bin/cylinder -fullscreen -OnlyShowIn=X-MeeGo; -X-MeeGo-Logical-Id=qtn_comm_appname_cylinder -X-MeeGo-Translation-Catalog=essentials diff --git a/examples/qt3d/cylinder/cylinder.pro b/examples/qt3d/cylinder/cylinder.pro index b557ae878..d69470e25 100644 --- a/examples/qt3d/cylinder/cylinder.pro +++ b/examples/qt3d/cylinder/cylinder.pro @@ -1,15 +1,12 @@ TEMPLATE = app TARGET = cylinder CONFIG += qt warn_on -QT += widgets qt3d +QT += qt3d SOURCES = cylinderview.cpp main.cpp HEADERS = cylinderview.h RESOURCES = cylinder.qrc -CONFIG += qt3d_deploy_pkg -include(../../../pkg.pri) - OTHER_FILES += \ cylinder.rc diff --git a/examples/qt3d/cylinder/icon-l-qt3d.png b/examples/qt3d/cylinder/icon-l-qt3d.png Binary files differdeleted file mode 100644 index 07cc4092d..000000000 --- a/examples/qt3d/cylinder/icon-l-qt3d.png +++ /dev/null diff --git a/examples/qt3d/cylinder/m5-cylinder.desktop b/examples/qt3d/cylinder/m5-cylinder.desktop deleted file mode 100644 index 6edf612fa..000000000 --- a/examples/qt3d/cylinder/m5-cylinder.desktop +++ /dev/null @@ -1,14 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Name=Cappucino -Comment=Qt3D example application -Exec=/usr/bin/cylinder -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/cylinder/main.cpp b/examples/qt3d/cylinder/main.cpp index 27ffd1739..cd968949c 100644 --- a/examples/qt3d/cylinder/main.cpp +++ b/examples/qt3d/cylinder/main.cpp @@ -38,12 +38,13 @@ ** ****************************************************************************/ -#include <QApplication> +#include <QGuiApplication> + #include "cylinderview.h" int main(int argc, char *argv[]) { - QApplication app(argc, argv); + QGuiApplication app(argc, argv); CylinderView view; if (view.stereoType() != QGLView::RedCyanAnaglyph) 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 Binary files differdeleted 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) diff --git a/examples/qt3d/graphicsview/graphicsview.desktop b/examples/qt3d/graphicsview/graphicsview.desktop deleted file mode 100644 index 8c460a67b..000000000 --- a/examples/qt3d/graphicsview/graphicsview.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Type=Application -Name=GraphicsView -Icon=icon-l-qt3d -Exec=/usr/bin/graphicsview -fullscreen -OnlyShowIn=X-MeeGo; -X-MeeGo-Logical-Id=qtn_comm_appname_graphicsview -X-MeeGo-Translation-Catalog=essentials diff --git a/examples/qt3d/graphicsview/graphicsview.pro b/examples/qt3d/graphicsview/graphicsview.pro index 452e9fdde..a8ba2f1ba 100644 --- a/examples/qt3d/graphicsview/graphicsview.pro +++ b/examples/qt3d/graphicsview/graphicsview.pro @@ -1,7 +1,7 @@ TEMPLATE = app TARGET = graphicsview CONFIG += qt warn_on -QT += widgets qt3d +QT += qt3d VPATH += $$PWD/../../src/threed/geometry SOURCES = \ @@ -26,9 +26,6 @@ HEADERS = \ RESOURCES = \ graphicsview.qrc -CONFIG += qt3d_deploy_pkg -include(../../../pkg.pri) - OTHER_FILES += \ graphicsview.rc diff --git a/examples/qt3d/graphicsview/icon-l-qt3d.png b/examples/qt3d/graphicsview/icon-l-qt3d.png Binary files differdeleted file mode 100644 index 07cc4092d..000000000 --- a/examples/qt3d/graphicsview/icon-l-qt3d.png +++ /dev/null diff --git a/examples/qt3d/graphicsview/m5-graphicsview.desktop b/examples/qt3d/graphicsview/m5-graphicsview.desktop deleted file mode 100644 index 2667da450..000000000 --- a/examples/qt3d/graphicsview/m5-graphicsview.desktop +++ /dev/null @@ -1,14 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Name=GraphicsView -Comment=Qt3D example application -Exec=/usr/bin/graphicsview -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/graphicsview/main.cpp b/examples/qt3d/graphicsview/main.cpp index 2405111f2..d45f4b37b 100644 --- a/examples/qt3d/graphicsview/main.cpp +++ b/examples/qt3d/graphicsview/main.cpp @@ -39,9 +39,7 @@ ****************************************************************************/ #include <QApplication> -#include <QtOpenGL/qgl.h> -#include <QtCore/qmath.h> -#include <QtCore/qdatetime.h> + #include "view.h" int main(int argc, char *argv[]) diff --git a/examples/qt3d/nesting/icon-l-qt3d.png b/examples/qt3d/nesting/icon-l-qt3d.png Binary files differdeleted file mode 100644 index 07cc4092d..000000000 --- a/examples/qt3d/nesting/icon-l-qt3d.png +++ /dev/null diff --git a/examples/qt3d/nesting/m5-nesting.desktop b/examples/qt3d/nesting/m5-nesting.desktop deleted file mode 100644 index a81022e0b..000000000 --- a/examples/qt3d/nesting/m5-nesting.desktop +++ /dev/null @@ -1,14 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Name=Nesting -Comment=Qt3D example application -Exec=/usr/bin/nesting -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/nesting/main.cpp b/examples/qt3d/nesting/main.cpp index da1a26198..844aa5ca5 100644 --- a/examples/qt3d/nesting/main.cpp +++ b/examples/qt3d/nesting/main.cpp @@ -38,12 +38,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/examples/qt3d/nesting/nesting.desktop b/examples/qt3d/nesting/nesting.desktop deleted file mode 100644 index 59eff4577..000000000 --- a/examples/qt3d/nesting/nesting.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Nesting -Icon=icon-l-qt3d -Exec=/usr/bin/nesting -fullscreen -OnlyShowIn=X-MeeGo; -X-MeeGo-Logical-Id=qtn_comm_appname_nesting -X-MeeGo-Translation-Catalog=essentials diff --git a/examples/qt3d/nesting/nesting.pro b/examples/qt3d/nesting/nesting.pro index 1fdae9a49..8cdcecaf7 100644 --- a/examples/qt3d/nesting/nesting.pro +++ b/examples/qt3d/nesting/nesting.pro @@ -1,15 +1,12 @@ TEMPLATE = app TARGET = nesting CONFIG += qt warn_on -QT += widgets qt3d +QT += qt3d SOURCES = cubeview.cpp main.cpp HEADERS = cubeview.h RESOURCES = nesting.qrc -CONFIG += qt3d_deploy_pkg -include(../../../pkg.pri) - OTHER_FILES += \ nesting.rc diff --git a/examples/qt3d/qt3d.pro b/examples/qt3d/qt3d.pro index 07b7c8dc6..24139f4b9 100644 --- a/examples/qt3d/qt3d.pro +++ b/examples/qt3d/qt3d.pro @@ -1,2 +1,4 @@ TEMPLATE = subdirs -SUBDIRS += basket builder cube cylinder geometry graphicsview nesting solarsystem tank teapot +SUBDIRS += basket builder cube cylinder geometry nesting solarsystem tank teapot + +contains(QT_CONFIG, opengl): contains(QT_CONFIG, widgets): SUBDIRS += graphicsview diff --git a/examples/qt3d/solarsystem/icon-l-qt3d.png b/examples/qt3d/solarsystem/icon-l-qt3d.png Binary files differdeleted file mode 100644 index 07cc4092d..000000000 --- a/examples/qt3d/solarsystem/icon-l-qt3d.png +++ /dev/null diff --git a/examples/qt3d/solarsystem/m5-solarsystem.desktop b/examples/qt3d/solarsystem/m5-solarsystem.desktop deleted file mode 100644 index b2dff71ab..000000000 --- a/examples/qt3d/solarsystem/m5-solarsystem.desktop +++ /dev/null @@ -1,14 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Name=Basket -Comment=Qt3D example application -Exec=/usr/bin/basket -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/solarsystem/main.cpp b/examples/qt3d/solarsystem/main.cpp index eb64b07c9..fa6e118e6 100644 --- a/examples/qt3d/solarsystem/main.cpp +++ b/examples/qt3d/solarsystem/main.cpp @@ -38,13 +38,13 @@ ** ****************************************************************************/ -#include <QApplication> +#include <QGuiApplication> #include "solarsystem.h" int main(int argc, char *argv[]) { - QApplication app(argc, argv); + QGuiApplication app(argc, argv); SolarSystemView view; QStringList args = QCoreApplication::arguments(); diff --git a/examples/qt3d/solarsystem/solarsystem.cpp b/examples/qt3d/solarsystem/solarsystem.cpp index c411dc669..70b649552 100644 --- a/examples/qt3d/solarsystem/solarsystem.cpp +++ b/examples/qt3d/solarsystem/solarsystem.cpp @@ -38,7 +38,6 @@ ** ****************************************************************************/ -#include <QPropertyAnimation> #include "solarsystem.h" #include "qglbuilder.h" #include "qglmaterialcollection.h" @@ -50,11 +49,11 @@ #include "qgraphicsrotation3d.h" #include "qgraphicstranslation3d.h" #include "qglshaderprogrameffect.h" -#include "qglshaderprogram.h" - -#include <QtGui/qmatrix4x4.h> -#include <QtCore/qmath.h> +#include <QPropertyAnimation> +#include <QOpenGLShaderProgram> +#include <QMatrix4x4> +#include <qmath.h> SolarSystemView::SolarSystemView(QWindow *parent) : QGLView(parent) diff --git a/examples/qt3d/solarsystem/solarsystem.desktop b/examples/qt3d/solarsystem/solarsystem.desktop deleted file mode 100644 index c64ec3dc9..000000000 --- a/examples/qt3d/solarsystem/solarsystem.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Basket -Icon=icon-l-qt3d -Exec=/usr/bin/basket -fullscreen -OnlyShowIn=X-MeeGo; -X-MeeGo-Logical-Id=qtn_comm_appname_basket -X-MeeGo-Translation-Catalog=essentials diff --git a/examples/qt3d/solarsystem/solarsystem.pro b/examples/qt3d/solarsystem/solarsystem.pro index e14b3fe43..344cc82a4 100644 --- a/examples/qt3d/solarsystem/solarsystem.pro +++ b/examples/qt3d/solarsystem/solarsystem.pro @@ -1,7 +1,7 @@ TEMPLATE = app TARGET = solarsystem CONFIG += qt warn_on -QT += widgets qt3d +QT += qt3d SOURCES = solarsystem.cpp \ main.cpp @@ -9,9 +9,6 @@ HEADERS = solarsystem.h RESOURCES += solarsystem.qrc DEPENDPATH += resources -CONFIG += qt3d_deploy_pkg -include(../../../pkg.pri) - OTHER_FILES += \ resources/moon-texture.jpg \ resources/planet.jpg \ diff --git a/examples/qt3d/tank/icon-l-qt3d.png b/examples/qt3d/tank/icon-l-qt3d.png Binary files differdeleted file mode 100644 index 07cc4092d..000000000 --- a/examples/qt3d/tank/icon-l-qt3d.png +++ /dev/null diff --git a/examples/qt3d/tank/m5-tank.desktop b/examples/qt3d/tank/m5-tank.desktop deleted file mode 100644 index ec6dfe0ed..000000000 --- a/examples/qt3d/tank/m5-tank.desktop +++ /dev/null @@ -1,14 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Name=Tank -Comment=Qt3D example application -Exec=/usr/bin/tank -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/tank/main.cpp b/examples/qt3d/tank/main.cpp index 763327fc1..97f628496 100644 --- a/examples/qt3d/tank/main.cpp +++ b/examples/qt3d/tank/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtWidgets/QApplication> +#include <QGuiApplication> #include <time.h> @@ -48,7 +48,7 @@ int main(int argc, char *argv[]) { qsrand(time(0)); - QApplication a(argc, argv); + QGuiApplication a(argc, argv); TankView view; if (view.stereoType() != QGLView::RedCyanAnaglyph) diff --git a/examples/qt3d/tank/quadplane.cpp b/examples/qt3d/tank/quadplane.cpp index 1ac1e5e52..91c303910 100644 --- a/examples/qt3d/tank/quadplane.cpp +++ b/examples/qt3d/tank/quadplane.cpp @@ -41,6 +41,9 @@ #include "quadplane.h" #include "qgraphicsrotation3d.h" +#include <QImage> +#include <QPainter> + QGLMaterial *qCreateFloor() { quint32 sz = 512; diff --git a/examples/qt3d/tank/tank.desktop b/examples/qt3d/tank/tank.desktop deleted file mode 100644 index e9636e175..000000000 --- a/examples/qt3d/tank/tank.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Tank -Icon=icon-l-qt3d -Exec=/usr/bin/tank -fullscreen -OnlyShowIn=X-MeeGo; -X-MeeGo-Logical-Id=qtn_comm_appname_tank -X-MeeGo-Translation-Catalog=essentials diff --git a/examples/qt3d/tank/tank.pro b/examples/qt3d/tank/tank.pro index a7d639c67..d82489d5a 100644 --- a/examples/qt3d/tank/tank.pro +++ b/examples/qt3d/tank/tank.pro @@ -1,7 +1,7 @@ TARGET = tank TEMPLATE = app CONFIG += qt warn_on -QT += widgets qt3d +QT += qt3d SOURCES += main.cpp\ tankview.cpp \ @@ -12,9 +12,6 @@ HEADERS += tankview.h \ tank.h \ quadplane.h -CONFIG += qt3d_deploy_pkg -include(../../../pkg.pri) - OTHER_FILES += \ tank.rc diff --git a/examples/qt3d/teapot/icon-l-qt3d.png b/examples/qt3d/teapot/icon-l-qt3d.png Binary files differdeleted file mode 100644 index 07cc4092d..000000000 --- a/examples/qt3d/teapot/icon-l-qt3d.png +++ /dev/null diff --git a/examples/qt3d/teapot/m5-teapot.desktop b/examples/qt3d/teapot/m5-teapot.desktop deleted file mode 100644 index 091cc63b1..000000000 --- a/examples/qt3d/teapot/m5-teapot.desktop +++ /dev/null @@ -1,14 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Name=Teapot -Comment=Qt3D example application -Exec=/usr/bin/teapot -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/teapot/main.cpp b/examples/qt3d/teapot/main.cpp index be7221829..aef883d60 100644 --- a/examples/qt3d/teapot/main.cpp +++ b/examples/qt3d/teapot/main.cpp @@ -38,13 +38,14 @@ ** ****************************************************************************/ -#include <QApplication> +#include <QGuiApplication> + #include "teapotview.h" //! [main] int main(int argc, char *argv[]) { - QApplication app(argc, argv); + QGuiApplication app(argc, argv); TeapotView view; //! [main-args] diff --git a/examples/qt3d/teapot/teapot.desktop b/examples/qt3d/teapot/teapot.desktop deleted file mode 100644 index 264fe1a92..000000000 --- a/examples/qt3d/teapot/teapot.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Type=Application -Name=teapot Qt3D -Icon=icon-l-qt3d -Exec=/usr/bin/teapot -fullscreen -OnlyShowIn=X-MeeGo; -X-MeeGo-Logical-Id=qtn_comm_appname_teapot -X-MeeGo-Translation-Catalog=essentials diff --git a/examples/qt3d/teapot/teapot.pro b/examples/qt3d/teapot/teapot.pro index f8930978f..6ef036f7c 100644 --- a/examples/qt3d/teapot/teapot.pro +++ b/examples/qt3d/teapot/teapot.pro @@ -1,14 +1,11 @@ TEMPLATE = app TARGET = teapot CONFIG += qt warn_on -QT += widgets qt3d +QT += qt3d SOURCES = teapotview.cpp main.cpp HEADERS = teapotview.h -CONFIG += qt3d_deploy_pkg -include(../../../pkg.pri) - OTHER_FILES += \ teapot.rc |