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

Merge branch 'master' of https://github.com/Itseez/opencv into linux-window-mouse-wheel-support

Browse Source
This commit is contained in:
Alexandr Kondratev
2016-07-21 18:16:41 +03:00
parent 13aef2c0cf 371096493c
commit ecfabd7aac
297 changed files with 45749 additions and 1605 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/highgui/src/window_QT.cpp
+1 -1
View File
@@ -55,7 +55,7 @@
#endif
#ifdef HAVE_QT_OPENGL
#ifdef Q_WS_X11
#if defined Q_WS_X11 /* Qt4 */ || defined Q_OS_LINUX /* Qt5 */
#include <GL/glx.h>
#endif
#endif