Merge pull request #6916 from ilya-lavrenov:qt5

bfb4ebfa · Alexander Alekhin · 0e6aa189 · 3bf16da9 · bfb4ebfa
Commit bfb4ebfa authored Jul 15, 2016 by Alexander Alekhin
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

window_QT.cpp modules/highgui/src/window_QT.cpp +1 -1

No files found.
--- 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