From e50ab31091052246c3a5412a3bbc8d528b2ebb47 Mon Sep 17 00:00:00 2001 From: Paolo Cignoni Date: Tue, 13 Jun 2017 11:30:19 +0200 Subject: [PATCH] Moved glew.h inclusion under guards to avoid qt conflicts --- wrap/gui/trackball.cpp | 5 +++++ wrap/gui/trackmode.cpp | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/wrap/gui/trackball.cpp b/wrap/gui/trackball.cpp index 1dd6ec2c..aba34cff 100644 --- a/wrap/gui/trackball.cpp +++ b/wrap/gui/trackball.cpp @@ -21,7 +21,12 @@ * * ****************************************************************************/ +#ifdef QT_OPENGL_LIB +#include +#else #include +#endif + #include "trackball.h" #include diff --git a/wrap/gui/trackmode.cpp b/wrap/gui/trackmode.cpp index f8157f62..7365c764 100644 --- a/wrap/gui/trackmode.cpp +++ b/wrap/gui/trackmode.cpp @@ -21,7 +21,12 @@ * * ****************************************************************************/ +#ifdef QT_OPENGL_LIB +#include +#else #include +#endif + #include #include #include