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 /tutorials | |
| 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 'tutorials')
8 files changed, 6 insertions, 65 deletions
diff --git a/tutorials/quick3d/teapot_bounce_qml/m5-teapot_bounce_qml.desktop b/tutorials/quick3d/teapot_bounce_qml/m5-teapot_bounce_qml.desktop deleted file mode 100644 index 75214a26a..000000000 --- a/tutorials/quick3d/teapot_bounce_qml/m5-teapot_bounce_qml.desktop +++ /dev/null @@ -1,14 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Name=Teapot Bounce -Comment=Qt3D example application -Exec=/usr/bin/teapot_bounce_qml -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/tutorials/quick3d/teapot_bounce_qml/main.cpp b/tutorials/quick3d/teapot_bounce_qml/main.cpp index 848059216..810bf72c3 100644 --- a/tutorials/quick3d/teapot_bounce_qml/main.cpp +++ b/tutorials/quick3d/teapot_bounce_qml/main.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include <QtGui/QGuiApplication> -#include <QtQuick/qquickview.h> +#include <QGuiApplication> +#include <QQuickView> #include "../qmlres.h" diff --git a/tutorials/quick3d/teapot_bounce_qml/teapot_bounce_qml.desktop b/tutorials/quick3d/teapot_bounce_qml/teapot_bounce_qml.desktop deleted file mode 100644 index 14bbdce87..000000000 --- a/tutorials/quick3d/teapot_bounce_qml/teapot_bounce_qml.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Teapot Bounce -Icon=icon-l-qtquick3d -Exec=/usr/bin/teapot_bounce_qml -fullscreen -OnlyShowIn=X-MeeGo; -X-MeeGo-Logical-Id=qtn_comm_appname_teapot_bounce_qml -X-MeeGo-Translation-Catalog=essentials diff --git a/tutorials/quick3d/teapot_bounce_qml/teapot_bounce_qml.pro b/tutorials/quick3d/teapot_bounce_qml/teapot_bounce_qml.pro index 7db5ca199..0c69061cf 100644 --- a/tutorials/quick3d/teapot_bounce_qml/teapot_bounce_qml.pro +++ b/tutorials/quick3d/teapot_bounce_qml/teapot_bounce_qml.pro @@ -2,15 +2,8 @@ TEMPLATE = app TARGET = teapot_bounce_qml CONFIG += qt warn_on -QT += declarative quick qt3dquick +QT += qt3d quick SOURCES += main.cpp HEADERS += ../qmlres.h -DESTDIR = ../../../bin - -INSTALL_DIRS = qml - -CONFIG += qt3d_deploy_qml -include(../../../pkg.pri) -qtcAddDeployment() diff --git a/tutorials/quick3d/teapot_qml/m5-teapot_qml.desktop b/tutorials/quick3d/teapot_qml/m5-teapot_qml.desktop deleted file mode 100644 index e5a298e67..000000000 --- a/tutorials/quick3d/teapot_qml/m5-teapot_qml.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_qml -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/tutorials/quick3d/teapot_qml/main.cpp b/tutorials/quick3d/teapot_qml/main.cpp index 5c7a7f651..d5daefd1e 100644 --- a/tutorials/quick3d/teapot_qml/main.cpp +++ b/tutorials/quick3d/teapot_qml/main.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include <QtGui/QGuiApplication> -#include <QtDeclarative/qquickview.h> +#include <QGuiApplication> +#include <QQuickView> #include "../qmlres.h" diff --git a/tutorials/quick3d/teapot_qml/teapot_qml.desktop b/tutorials/quick3d/teapot_qml/teapot_qml.desktop deleted file mode 100644 index 733cb7936..000000000 --- a/tutorials/quick3d/teapot_qml/teapot_qml.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Teapot -Icon=icon-l-qtquick3d -Exec=/usr/bin/teapot_qml -fullscreen -OnlyShowIn=X-MeeGo; -X-MeeGo-Logical-Id=qtn_comm_appname_teapot_qml -X-MeeGo-Translation-Catalog=essentials diff --git a/tutorials/quick3d/teapot_qml/teapot_qml.pro b/tutorials/quick3d/teapot_qml/teapot_qml.pro index 72b29256d..022d075ba 100644 --- a/tutorials/quick3d/teapot_qml/teapot_qml.pro +++ b/tutorials/quick3d/teapot_qml/teapot_qml.pro @@ -2,15 +2,7 @@ TEMPLATE = app TARGET = teapot_qml CONFIG += qt warn_on -QT += declarative quick qt3dquick +QT += qt3d quick SOURCES += main.cpp HEADERS += ../qmlres.h - -DESTDIR = ../../../bin - -INSTALL_DIRS = qml - -CONFIG += qt3d_deploy_qml -include(../../../pkg.pri) -qtcAddDeployment() |