Get tests building when QT_NO_OPENGL is defined

Change-Id: I36f9e5e916b59657990d7613850ba76d2489a21e
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>

1 files changed, 15 insertions, 5 deletions

diff --git a/tests/auto/quick/scenegraph/tst_scenegraph.cpp b/tests/auto/quick/scenegraph/tst_scenegraph.cpp
index 1cca56a876..6f00d5f9f2 100644
--- a/tests/auto/quick/scenegraph/tst_scenegraph.cpp
+++ b/tests/auto/quick/scenegraph/tst_scenegraph.cpp
@@ -28,18 +28,22 @@
 
 #include <qtest.h>
 
+#ifndef QT_NO_OPENGL
 #include <QOffscreenSurface>
 #include <QOpenGLContext>
 #include <QOpenGLFunctions>
+#endif
 
 #include <QtQuick>
 #include <QtQml>
 
+#ifndef QT_NO_OPENGL
 #include <private/qopenglcontext_p.h>
+#endif
+
 #include <private/qsgcontext_p.h>
 #include <private/qsgrenderloop_p.h>
 
-
 class PerPixelRect : public QQuickItem
 {
     Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
@@ -96,9 +100,9 @@ private slots:
 
     void render_data();
     void render();
-
+#ifndef QT_NO_OPENGL
     void hideWithOtherContext();
-
+#endif
     void createTextureFromImage_data();
     void createTextureFromImage();
 
@@ -118,6 +122,7 @@ void tst_SceneGraph::initTestCase()
     QSGRenderLoop *loop = QSGRenderLoop::instance();
     qDebug() << "RenderLoop:        " << loop;
 
+#ifndef QT_NO_OPENGL
     QOpenGLContext context;
     context.setFormat(loop->sceneGraphContext()->defaultSurfaceFormat());
     context.create();
@@ -150,6 +155,7 @@ void tst_SceneGraph::initTestCase()
     qDebug() << "Broken Mipmap:    " << m_brokenMipmapSupport;
 
     context.doneCurrent();
+#endif
 }
 
 QQuickView *createView(const QString &file, QWindow *parent = 0, int x = -1, int y = -1, int w = -1, int h = -1)
@@ -251,24 +257,26 @@ void tst_SceneGraph::manyWindows_data()
     QTest::newRow("rects,subwindow,sharing") << QStringLiteral("manyWindows_rects.qml") << false << true;
 }
 
+#ifndef QT_NO_OPENGL
 struct ShareContextResetter {
 public:
     ~ShareContextResetter() { qt_gl_set_global_share_context(0); }
 };
+#endif
 
 void tst_SceneGraph::manyWindows()
 {
     QFETCH(QString, file);
     QFETCH(bool, toplevel);
     QFETCH(bool, shared);
-
+#ifndef QT_NO_OPENGL
     QOpenGLContext sharedGLContext;
     ShareContextResetter cleanup; // To avoid dangling pointer in case of test-failure.
     if (shared) {
         QVERIFY(sharedGLContext.create());
         qt_gl_set_global_share_context(&sharedGLContext);
     }
-
+#endif
     QScopedPointer<QWindow> parent;
     if (!toplevel) {
         parent.reset(new QWindow());
@@ -499,6 +507,7 @@ void tst_SceneGraph::render()
     }
 }
 
+#ifndef QT_NO_OPENGL
 // Testcase for QTBUG-34898. We make another context current on another surface
 // in the GUI thread and hide the QQuickWindow while the other context is
 // current on the other window.
@@ -531,6 +540,7 @@ void tst_SceneGraph::hideWithOtherContext()
     // GL calls to a new frame (see QOpenGLContext docs).
     QVERIFY(!renderingOnMainThread || QOpenGLContext::currentContext() != &context);
 }
+#endif
 
 void tst_SceneGraph::createTextureFromImage_data()
 {