merged 2.4 into trunk

2012-04-30 14:33:52 +00:00
parent 3f1c6d7357
commit d5a0088bbe
194 changed files with 10158 additions and 8225 deletions
--- a/modules/highgui/src/window_QT.cpp
+++ b/modules/highgui/src/window_QT.cpp
@@ -49,6 +49,8 @@

 #ifdef _WIN32
 #include <windows.h>
+#else
+#include <unistd.h>
 #endif

 #ifdef HAVE_QT_OPENGL