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

modules/highgui/include/opencv2/highgui.hpp

@@ -425,7 +425,7 @@ CV_EXPORTS_W double getWindowProperty(const String& winname, int prop_id);
 
 @param winname Name of the window.
 @param onMouse Mouse callback. See OpenCV samples, such as
-<https://github.com/Itseez/opencv/tree/master/samples/cpp/ffilldemo.cpp>, on how to specify and
+<https://github.com/opencv/opencv/tree/master/samples/cpp/ffilldemo.cpp>, on how to specify and
 use the callback.
 @param userdata The optional parameter passed to the callback.
  */

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