CMakeLists.txt

@@ -516,11 +516,14 @@ if (WITH_QT)
     find_package(Qt4)
     if (QT4_FOUND)
         set(HAVE_QT 1)
-        find_package (OpenGL QUIET)
+        #add_definitions(-DHAVE_QT)
-        if (QT_QTOPENGL_FOUND AND OPENGL_FOUND)
+        set_property(DIRECTORY PROPERTY COMPILE_DEFINITIONS "HAVE_QT")
-			set(HAVE_QT_OPENGL 1)
+        
-			add_definitions(-DHAVE_QT_OPENGL)
+        #find_package (OpenGL QUIET)
-        endif()
+        #if (QT_QTOPENGL_FOUND AND OPENGL_FOUND)
+		#	set(HAVE_QT_OPENGL 1)
+		#	add_definitions(-DHAVE_QT_OPENGL)
+        #endif()
     endif()
 endif()
         

modules/highgui/src/window.cpp

@@ -368,61 +368,51 @@ CV_IMPL int cvStartWindowThread()
 CV_IMPL void cvAddText( const CvArr*, const char*, CvPoint org, CvFont font)
 {
     CV_NO_GUI_ERROR("cvAddText");
-    return -1;
 }
 
 CV_IMPL void cvDisplayStatusBar(const char* name, const char* arg2, int arg3)
 {
     CV_NO_GUI_ERROR("cvDisplayStatusBar");
-    return -1;
 }  
 
 CV_IMPL void cvDisplayStatusBar(const char* name, const char* arg2, int arg3)
 {
     CV_NO_GUI_ERROR("cvDisplayStatusBar");
-    return -1;
 }  
 
 CV_IMPL void cvCreateOpenGLCallback(const char* name, cvOpenGLCallback callback, void* param)
 {
     CV_NO_GUI_ERROR("createOpenGLCallback");
-    return -1;
 }  
 
 CV_IMPL void cvDisplayOverlay(const char* name, const char* text, int delayms)
 {
     CV_NO_GUI_ERROR("cvNamedWindow");
-    return -1;
 }  
 
 CV_IMPL void cvStartLoop(int (*pt2Func)(int argc, char *argv[]), int argc, char* argv[])
 {
     CV_NO_GUI_ERROR("cvStartLoop");
-    return -1;
 }  
 
 CV_IMPL void cvStopLoop()
 {
     CV_NO_GUI_ERROR("cvStopLoop");
-    return -1;
 }  
 
 CV_IMPL void cvSaveWindowParameters(const char* name)
 {
     CV_NO_GUI_ERROR("cvSaveWindowParameters");
-    return -1;
 }  
 
 CV_IMPL void cvLoadWindowParameterss(const char* name)
 {
     CV_NO_GUI_ERROR("cvLoadWindowParameters");
-    return -1;
 }  
 
 CV_IMPL void cvCreateButton(const char* arg1, const char* arg2, cvButtonCallback on_change, const char* name, void* userdata)
 {
     CV_NO_GUI_ERROR("cvCreateButton");
-    return -1;
 }  
 
 

modules/highgui/src/window_QT.cpp

@@ -39,7 +39,7 @@
 //--------------------Google Code 2010 -- Yannick Verdie--------------------//
 
 
-#ifdef HAVE_QT
+#if defined(HAVE_QT)
 
 #include <window_QT.h>
 
@@ -266,7 +266,7 @@ CV_IMPL int cvWaitKey( int arg )
 				 */
 
 #if defined WIN32 || defined _WIN32 || defined WIN64 || defined _WIN64
-				sleep(2);
+				Sleep(2);
 #else
 				usleep(2);//to decrease CPU usage
 #endif
@@ -1928,6 +1928,7 @@ void ViewPort::setMouseCallBack(CvMouseCallback m, void* param)
 
 void ViewPort::setOpenGLCallback(CvOpenGLCallback func,void* userdata, double angle_arg, double zmin_arg, double zmax_arg)
 {
+#if defined( HAVE_QT_OPENGL )//all this section -> not tested
 	on_openGL_draw3D = func;
 	on_openGL_param = userdata;
 	
@@ -1947,7 +1948,7 @@ void ViewPort::setOpenGLCallback(CvOpenGLCallback func,void* userdata, double an
 		zmax = zmax_arg;
 	else
 		zmax = DEFAULT_ZMAX;
-	
+#endif
 }
 
 void ViewPort::controlImagePosition()

modules/highgui/src/window_QT.h

@@ -43,7 +43,7 @@
 
 #include "precomp.hpp"
 
-#if defined(HAVE_QT_OPENGL)//OPENCV_GL)
+#if defined( HAVE_QT_OPENGL )
 #include <QtOpenGL>
 #include <QGLWidget>
 #endif