Merge pull request #7006 from derlunz:fix-qtopengl-build

8cdd91cd · Alexander Alekhin · 6cff909b · 81e6ef29 · 8cdd91cd
Commit 8cdd91cd authored Jul 27, 2016 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

window_QT.cpp modules/highgui/src/window_QT.cpp +0 -3

No files found.
--- a/modules/highgui/src/window_QT.cpp
+++ b/modules/highgui/src/window_QT.cpp
@@ -3201,9 +3201,6 @@ void OpenGlViewPort::wheelEvent(QWheelEvent* evnt)
    icvmouseHandler((QMouseEvent*)evnt, mouse_wheel, cv_event, flags);
    icvmouseProcessing(QPointF(pt), cv_event, flags);

-    scaleView(delta / 240.0, pt);
-    viewport()->update();
-
    QWidget::wheelEvent(evnt);
 }