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 <[email protected]>
dignakov · Dec 21, 2011 · aedf27c · aedf27c
1 parent a7db0a7
commit aedf27c
Show file tree

Hide file tree

Showing 280 changed files with 902 additions and 2,118 deletions.
diff --git a/demos/qt3d/cubehouse/cubehouse.desktop b/demos/qt3d/cubehouse/cubehouse.desktop
diff --git 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
diff --git a/demos/qt3d/cubehouse/m5-cubehouse.desktop b/demos/qt3d/cubehouse/m5-cubehouse.desktop
diff --git 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
@@ -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
diff --git a/demos/qt3d/pageflip/m5-pageflip.desktop b/demos/qt3d/pageflip/m5-pageflip.desktop
diff --git 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
diff --git 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
@@ -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
@@ -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
diff --git 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
@@ -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
diff --git a/demos/qt3d/photobrowser3d/main.cpp b/demos/qt3d/photobrowser3d/main.cpp
@@ -39,16 +39,16 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets/QApplication>
-#include <QtCore/QThread>
+#include <QGuiApplication>
+#include <QThread>
 
 #include "photobrowser3dview.h"
 
 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
diff --git 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
@@ -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
@@ -79,7 +79,7 @@ class PhotoBrowser3DView : public QGLView
     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
@@ -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
@@ -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
@@ -41,7 +41,7 @@
 
 #include "thumbnaileffect.h"
 
-#include <QtOpenGL/qglshaderprogram.h>
+#include <QOpenGLShaderProgram>
 
 class ThumbnailEffectPrivate
 {
@@ -56,7 +56,7 @@ class ThumbnailEffectPrivate
     }
     ~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
diff --git a/demos/qt3d/shapes/m5-shapes.desktop b/demos/qt3d/shapes/m5-shapes.desktop
diff --git 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