fixed build with Qt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d5d775d..2d0a900 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1125,7 +1125,7 @@ if(WIN32)
         endif()  
     endif()
 
-    if (WITH_OPENGL)
+    if (WITH_OPENGL AND NOT HAVE_QT_OPENGL)
         find_package(OpenGL QUIET)
         
         if (OPENGL_FOUND)

diff --git a/modules/highgui/src/window.cpp b/modules/highgui/src/window.cpp
index 556a7af..cbe62c5 100644 (file)
--- a/modules/highgui/src/window.cpp
+++ b/modules/highgui/src/window.cpp
@@ -126,8 +126,9 @@ CV_IMPL double cvGetWindowProperty(const char* name, int prop_id)
     break;
 
     case CV_WND_PROP_OPENGL:
-
-        #if defined WIN32 || defined _WIN32 
+        
+        #if defined (HAVE_QT)
+        #elif defined WIN32 || defined _WIN32 
             return cvGetOpenGlProp_W32(name);
         #else
             return -1;
@@ -137,6 +138,7 @@ CV_IMPL double cvGetWindowProperty(const char* name, int prop_id)
     default:
         return -1;
     }
+    return -1;
 }
 
 void cv::namedWindow( const string& winname, int flags )
@@ -591,10 +593,12 @@ void cv::pointCloudShow(const string& winname, const gpu::GlCamera& camera, Inpu
 
 #ifndef HAVE_OPENGL
 
+#ifndef HAVE_QT
 CV_IMPL void cvCreateOpenGLCallback(const char*, CvOpenGLCallback, void*, double, double, double)
 {
     CV_Error(CV_OpenGlNotSupported, "The library is compiled without OpenGL support"); 
 }
+#endif
 
 CV_IMPL void cvSetOpenGlContext(const char*)
 {

diff --git a/modules/highgui/src/window_w32.cpp b/modules/highgui/src/window_w32.cpp
index 57a6a57..c89faa3 100644 (file)
--- a/modules/highgui/src/window_w32.cpp
+++ b/modules/highgui/src/window_w32.cpp
@@ -581,14 +581,6 @@ double cvGetOpenGlProp_W32(const char* name)
     typedef ptrdiff_t GLsizeiptr;
 #endif
 
-#ifndef GL_BGR
-    #define GL_BGR 0x80E0
-#endif
-
-#ifndef GL_BGRA
-    #define GL_BGRA 0x80E1
-#endif
-
 namespace
 {
     typedef void (APIENTRYP PFNGLGENBUFFERSPROC   ) (GLsizei n, GLuint *buffers);