3 files changed, 17 insertions, 5 deletions
diff --git a/src/gui/kernel/kernel.pri b/src/gui/kernel/kernel.pri
index 12cb42c741..b46a9f0f10 100644
--- a/src/gui/kernel/kernel.pri
+++ b/src/gui/kernel/kernel.pri
@@ -21,9 +21,6 @@ HEADERS += \
         kernel/qplatformthemefactory_qpa_p.h \
         kernel/qplatformthemeplugin_qpa.h \
         kernel/qplatformwindow_qpa.h \
-        kernel/qplatformopenglcontext_qpa.h \
-        kernel/qopenglcontext.h \
-        kernel/qopenglcontext_p.h \
         kernel/qplatformcursor_qpa.h \
         kernel/qplatformclipboard_qpa.h \
         kernel/qplatformnativeinterface_qpa.h \
@@ -72,8 +69,6 @@ SOURCES += \
         kernel/qplatformthemefactory_qpa.cpp \
         kernel/qplatformthemeplugin_qpa.cpp \
         kernel/qplatformwindow_qpa.cpp \
-        kernel/qplatformopenglcontext_qpa.cpp \
-        kernel/qopenglcontext.cpp \
         kernel/qplatformcursor_qpa.cpp \
         kernel/qplatformclipboard_qpa.cpp \
         kernel/qplatformnativeinterface_qpa.cpp \
@@ -100,4 +95,15 @@ SOURCES += \
         kernel/qtouchdevice.cpp \
         kernel/qplatformsharedgraphicscache_qpa.cpp
 
+contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles2)|contains(QT_CONFIG, egl) {
+    HEADERS += \
+            kernel/qplatformopenglcontext_qpa.h \
+            kernel/qopenglcontext.h \
+            kernel/qopenglcontext_p.h
+
+    SOURCES += \
+            kernel/qplatformopenglcontext_qpa.cpp \
+            kernel/qopenglcontext.cpp
+}
+
 win32:HEADERS+=kernel/qwindowdefs_win.h
diff --git a/src/gui/kernel/qopenglcontext.h b/src/gui/kernel/qopenglcontext.h
index 30e4fee0eb..29fed4400c 100644
--- a/src/gui/kernel/qopenglcontext.h
+++ b/src/gui/kernel/qopenglcontext.h
@@ -42,6 +42,8 @@
 #ifndef QOPENGLCONTEXT_H
 #define QOPENGLCONTEXT_H
 
+#ifndef QT_NO_OPENGL
+
 #include <QtCore/qnamespace.h>
 #include <QtCore/QObject>
 #include <QtCore/QScopedPointer>
@@ -146,4 +148,6 @@ QT_END_NAMESPACE
 
 QT_END_HEADER
 
+#endif // QT_NO_OPENGL
+
 #endif // QGUIGLCONTEXT_H
diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp
index deec2a8f83..2893273ce0 100644
--- a/src/gui/kernel/qwindow.cpp
+++ b/src/gui/kernel/qwindow.cpp
@@ -43,8 +43,10 @@
 
 #include "qplatformwindow_qpa.h"
 #include "qsurfaceformat.h"
+#ifndef QT_NO_OPENGL
 #include "qplatformopenglcontext_qpa.h"
 #include "qopenglcontext.h"
+#endif
 #include "qscreen.h"
 
 #include "qwindow_p.h"