Revert "Build (and fail) Quick with -no-opengl"

This reverts commit 707e6f528fc79db236d282e7ea41eb952c825433.

We will not pursue this route for the time being.

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

6 files changed, 10 insertions, 32 deletions

diff --git a/src/imports/imports.pro b/src/imports/imports.pro
index 528269e0f6..f7002f9ed5 100644
--- a/src/imports/imports.pro
+++ b/src/imports/imports.pro
@@ -11,13 +11,9 @@ SUBDIRS += \
 qtHaveModule(quick) {
     SUBDIRS += \
         qtquick2 \
-        window
-
-    contains(QT_CONFIG, opengl(es1|es2)?) {
-        SUBDIRS += \
-            particles \
-            testlib
-    }
+        particles \
+        window \
+        testlib
 }
 
 qtHaveModule(xmlpatterns) : SUBDIRS += xmllistmodel
diff --git a/src/quick/scenegraph/coreapi/qsggeometry.cpp b/src/quick/scenegraph/coreapi/qsggeometry.cpp
index cbc5f86527..5012f6a31b 100644
--- a/src/quick/scenegraph/coreapi/qsggeometry.cpp
+++ b/src/quick/scenegraph/coreapi/qsggeometry.cpp
@@ -42,10 +42,7 @@
 
 #include <qopenglcontext.h>
 #include <qopenglfunctions.h>
-
-#ifndef QT_NO_OPENGL
 #include <private/qopenglextensions_p.h>
-#endif
 
 #ifdef Q_OS_QNX
 #include <malloc.h>
diff --git a/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp
index ada358f02d..78b803df83 100644
--- a/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp
+++ b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp
@@ -45,10 +45,7 @@
 #include <QtGui/private/qguiapplication_p.h>
 #include <qpa/qplatformintegration.h>
 #include <private/qfontengine_p.h>
-
-#ifndef QT_NO_OPENGL
 #include <private/qopenglextensions_p.h>
-#endif
 
 #include <QtQuick/qquickwindow.h>
 #include <QtQuick/private/qsgtexture_p.h>
diff --git a/src/quick/scenegraph/util/qsgdefaultpainternode.cpp b/src/quick/scenegraph/util/qsgdefaultpainternode.cpp
index 925f3b5b9f..2deb993a6e 100644
--- a/src/quick/scenegraph/util/qsgdefaultpainternode.cpp
+++ b/src/quick/scenegraph/util/qsgdefaultpainternode.cpp
@@ -42,18 +42,13 @@
 #include <QtQuick/private/qquickpainteditem_p.h>
 
 #include <QtQuick/private/qsgcontext_p.h>
-
+#include <private/qopenglextensions_p.h>
 #include <qopenglframebufferobject.h>
 #include <qopenglfunctions.h>
 #include <qopenglpaintdevice.h>
-
 #include <qmath.h>
 #include <qpainter.h>
 
-#ifndef QT_NO_OPENGL
-#include <private/qopenglextensions_p.h>
-#endif
-
 QT_BEGIN_NAMESPACE
 
 #define QT_MINIMUM_DYNAMIC_FBO_SIZE 64U
diff --git a/src/quick/scenegraph/util/qsgdepthstencilbuffer_p.h b/src/quick/scenegraph/util/qsgdepthstencilbuffer_p.h
index 13a2803c30..c2d0590532 100644
--- a/src/quick/scenegraph/util/qsgdepthstencilbuffer_p.h
+++ b/src/quick/scenegraph/util/qsgdepthstencilbuffer_p.h
@@ -53,13 +53,10 @@
 
 #include <QtCore/qsize.h>
 #include <QtGui/private/qopenglcontext_p.h>
+#include <QtGui/private/qopenglextensions_p.h>
 #include <QtCore/qsharedpointer.h>
 #include <QtCore/qhash.h>
 
-#ifndef QT_NO_OPENGL
-#include <QtGui/private/qopenglextensions_p.h>
-#endif
-
 QT_BEGIN_NAMESPACE
 
 class QSGDepthStencilBufferManager;
diff --git a/src/src.pro b/src/src.pro
index f34e9cda9f..385e4eb601 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -3,17 +3,13 @@ CONFIG += ordered
 SUBDIRS += \
     qml
 
-qtHaveModule(gui) {
+qtHaveModule(gui):contains(QT_CONFIG, opengl(es1|es2)?) {
     SUBDIRS += \
-        quick
+        quick \
+        qmltest \
+        particles
 
-    contains(QT_CONFIG, opengl(es1|es2)?) {
-        SUBDIRS += \
-            qmltest \
-            particles
-
-        qtHaveModule(widgets): SUBDIRS += quickwidgets
-    }
+    qtHaveModule(widgets): SUBDIRS += quickwidgets
 }
 
 SUBDIRS += \