potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23:05 +04:00
Code Packages Releases Wiki Activity

New functions with QT GUI:

Browse Source 
- fix CMake OpenGL compilation
This commit is contained in:
Yannick Verdie
2010-06-26 14:33:14 +00:00
parent 6314cd28cf
commit 397b31e437
3 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/highgui/CMakeLists.txt
+12
View File
@@ -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)
modules/highgui/src/window_QT.h
+3 -1
View File
@@ -44,7 +44,9 @@
#include "precomp.hpp"
#if defined(OPENCV_GL)
#include <QGLWidget>
#include <QtOpenGL>
//#include <GL/glu.h>
//#include <QGLWidget>
#endif
#include <QAbstractEventDispatcher>