Merge remote-tracking branch 'upstream/2.4' into 2.4

2015-03-20 01:44:29 +01:00
parent a7bf1d53d8 69344f175b
commit 756c1a22d9
9 changed files with 29441 additions and 9 deletions
--- a/modules/highgui/src/window_QT.cpp
+++ b/modules/highgui/src/window_QT.cpp
@@ -1848,7 +1848,7 @@ bool CvWindow::isOpenGl()

 void CvWindow::setViewportSize(QSize _size)
 {
-    myView->getWidget()->resize(_size);
+    resize(_size);
    myView->setSize(_size);
 }