New functions with QT GUI:

- fix CMake OpenGL compilation

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 97cf0c5..5127460 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -502,9 +502,16 @@ set(AUTOSWITCH_QT 0)#uses to disable QT
 find_package(Qt4)# QUIET)\r
 if (QT4_FOUND AND AUTOSWITCH_QT)\r
     set(WITH_QT ON CACHE BOOL "Build with QT Backend support")\r
-    find_package (OPENGL QUIET)\r
+    find_package (OpenGL QUIET)\r
     if (QT_QTOPENGL_FOUND AND OPENGL_FOUND)\r
-    set(WITH_QT_OPENGL ON CACHE BOOL "Add OpenGL extention to QT")\r
+    \r
+               #GLU is not mandatory but we used gluPerspective in setGL so, we need it for now.\r
+               if (OPENGL_GLU_FOUND)\r
+                       set(WITH_QT_OPENGL ON CACHE BOOL "Add OpenGL extention to QT")\r
+               else()\r
+                   message(STATUS "OpenGL found but not GLU, please install it")\r
+               endif()\r
+               \r
     endif()\r
 endif()\r
     \r
@@ -519,14 +526,16 @@ if (WITH_QT)
                set(WITH_CARBON 0)\r
                message(STATUS "QT detected, so Carbon and Cocoa disabled")\r
                else()\r
+               set(WITH_GTK 0)\r
                set(HAVE_GTK 0)\r
+               set(WITH_GTHREAD 0)\r
                set(HAVE_GTHREAD 0)\r
                message(STATUS "QT detected, so GTK and GThread disabled")\r
                endif()\r
     endif()\r
     \r
     if (WITH_QT_OPENGL)\r
-    message(STATUS "OpenGL for QT enable")\r
+    message(STATUS "OpenGL for QT enable (with GLU)")\r
         set(HAVE_QT_OPENGL 1)\r
         add_definitions(-DOPENCV_GL=1)\r
     endif()\r

diff --git a/modules/highgui/CMakeLists.txt b/modules/highgui/CMakeLists.txt
index 634f9ec..8e4f62b 100644 (file)
--- a/modules/highgui/CMakeLists.txt
+++ b/modules/highgui/CMakeLists.txt
@@ -72,6 +72,10 @@ if(WIN32)
     if (HAVE_QT)
         
          #SET(QT_USE_QTXML 1)
+         if (HAVE_QT_OPENGL)
+                       set( QT_USE_QTOPENGL TRUE )
+                       set(HIGHGUI_LIBRARIES ${HIGHGUI_LIBRARIES} ${OPENGL_LIBRARIES})
+         endif()
                 INCLUDE(${QT_USE_FILE})
                 
                 SET(_MOC_HEADERS src/window_QT.h )
@@ -95,6 +99,10 @@ if(UNIX)
     if (HAVE_QT)        
     
          #SET(QT_USE_QTXML 1)
+         if (HAVE_QT_OPENGL)
+                       set( QT_USE_QTOPENGL TRUE )
+                       set(HIGHGUI_LIBRARIES ${HIGHGUI_LIBRARIES} ${OPENGL_LIBRARIES})
+         endif()
                 INCLUDE(${QT_USE_FILE})
                 
                 SET(_MOC_HEADERS src/window_QT.h)
@@ -188,6 +196,10 @@ if(APPLE)
     if (HAVE_QT)
 
          #SET(QT_USE_QTXML 1)
+         if (HAVE_QT_OPENGL)
+                       set( QT_USE_QTOPENGL TRUE )
+                       set(HIGHGUI_LIBRARIES ${HIGHGUI_LIBRARIES} ${OPENGL_LIBRARIES})
+         endif()
                 INCLUDE(${QT_USE_FILE})
                 
                 SET(_MOC_HEADERS src/window_QT.h)

diff --git a/modules/highgui/src/window_QT.h b/modules/highgui/src/window_QT.h
index b8e8a2d..f990d09 100644 (file)
--- a/modules/highgui/src/window_QT.h
+++ b/modules/highgui/src/window_QT.h
@@ -44,7 +44,9 @@
 #include "precomp.hpp"
 
 #if defined(OPENCV_GL)
-#include <QGLWidget>
+ #include <QtOpenGL>
+ //#include <GL/glu.h>
+//#include <QGLWidget>
 #endif
 
 #include <QAbstractEventDispatcher>