From 88f15faa4aad798d37df6a4baf1950c31d04dcf1 Mon Sep 17 00:00:00 2001 From: Andreas Holzammer Date: Wed, 8 Feb 2012 14:54:54 +0100 Subject: [PATCH] Fix compile with QT_NO_OPENGL. Change-Id: Icade54a6e3b43fdc9c151efbc25adcef6b7e41d6 Reviewed-by: Miikka Heikkinen Reviewed-by: Gunnar Sletta --- src/gui/kernel/qopenglcontext_p.h | 3 +++ src/gui/kernel/qplatformopenglcontext_qpa.h | 3 +++ src/opengl/qgl.h | 3 +++ 3 files changed, 9 insertions(+) diff --git a/src/gui/kernel/qopenglcontext_p.h b/src/gui/kernel/qopenglcontext_p.h index 7b4e880ade..3e2c35f088 100644 --- a/src/gui/kernel/qopenglcontext_p.h +++ b/src/gui/kernel/qopenglcontext_p.h @@ -42,6 +42,8 @@ #ifndef QGUIGLCONTEXT_P_H #define QGUIGLCONTEXT_P_H +#ifndef QT_NO_OPENGL + #include "qopengl.h" #include "qopenglcontext.h" #include @@ -245,4 +247,5 @@ QT_END_NAMESPACE QT_END_HEADER +#endif // QT_NO_OPENGL #endif // QGUIGLCONTEXT_P_H diff --git a/src/gui/kernel/qplatformopenglcontext_qpa.h b/src/gui/kernel/qplatformopenglcontext_qpa.h index 17d4e96f8e..af70368f5e 100644 --- a/src/gui/kernel/qplatformopenglcontext_qpa.h +++ b/src/gui/kernel/qplatformopenglcontext_qpa.h @@ -42,6 +42,8 @@ #ifndef QPLATFORMGLCONTEXT_H #define QPLATFORMGLCONTEXT_H +#ifndef QT_NO_OPENGL + #include #include #include @@ -91,5 +93,6 @@ QT_END_NAMESPACE QT_END_HEADER +#endif // QT_NO_OPENGL #endif // QPLATFORMGLCONTEXT_H diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h index be1651ea2f..caa5b96cdc 100644 --- a/src/opengl/qgl.h +++ b/src/opengl/qgl.h @@ -42,6 +42,8 @@ #ifndef QGL_H #define QGL_H +#ifndef QT_NO_OPENGL + #include #include #include @@ -551,4 +553,5 @@ QT_END_NAMESPACE QT_END_HEADER +#endif // QT_NO_OPENGL #endif // QGL_H