Mercurial > hg > orthanc-stone

changeset 1147:bc27c199eefe broker

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
qt
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 14 Nov 2019 15:53:49 +0100
parents 5035354b1369
children 5e164c629923
files Framework/OpenGL/OpenGLIncludes.h Framework/OpenGL/SdlOpenGLContext.cpp
diffstat 2 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/Framework/OpenGL/OpenGLIncludes.h	Tue Nov 12 20:03:23 2019 +0100
+++ b/Framework/OpenGL/OpenGLIncludes.h	Thu Nov 14 15:53:49 2019 +0100
@@ -32,6 +32,8 @@
 #if defined(__APPLE__)
 #  include <OpenGL/gl.h>
 #  include <OpenGL/glext.h>
+#elif defined(QT_VERSION_MAJOR) && (QT_VERSION >= 5)
+// Qt5 takes care of the inclusions
 #elif defined(_WIN32)
 // On Windows, use the compatibility headers provided by glew
 #  include <GL/glew.h>
--- a/Framework/OpenGL/SdlOpenGLContext.cpp	Tue Nov 12 20:03:23 2019 +0100
+++ b/Framework/OpenGL/SdlOpenGLContext.cpp	Thu Nov 14 15:53:49 2019 +0100
@@ -68,6 +68,7 @@
         GLenum err = glewInit();
         if (GLEW_OK != err)
         {
+          LOG(ERROR) << glewGetErrorString(err);
           throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError,
                                           "Cannot initialize glew");
         }