Merge pull request #6916 from ilya-lavrenov:qt5

2016-07-15 13:43:33 +00:00 · 2016-07-15 13:43:33 +00:00 · bfb4ebfa03
commit bfb4ebfa03
parent 0e6aa189cb 3bf16da92d
1 changed files with 1 additions and 1 deletions
--- a/modules/highgui/src/window_QT.cpp
+++ b/modules/highgui/src/window_QT.cpp
@ -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