Merge branch 4.x

modules/highgui/src/window_QT.cpp

@@ -795,7 +795,7 @@ void GuiReceiver::isLastWindow()
         delete guiMainThread;//delete global_control_panel too
         guiMainThread = NULL;
 
-        if (!doesExternalQAppExist)
+        if (doesExternalQAppExist)
         {
             qApp->quit();
         }
@@ -1665,13 +1665,6 @@ CvWindow::CvWindow(QString name, int arg2)
 }
 
 
-CvWindow::~CvWindow()
-{
-    if (guiMainThread)
-        guiMainThread->isLastWindow();
-}
-
-
 void CvWindow::setMouseCallBack(CvMouseCallback callback, void* param)
 {
     myView->setMouseCallBack(callback, param);
@@ -2185,6 +2178,15 @@ void CvWindow::keyPressEvent(QKeyEvent *evnt)
 }
 
 
+void CvWindow::closeEvent(QCloseEvent* evnt)
+{
+    QWidget::closeEvent(evnt);
+
+    if (guiMainThread)
+        guiMainThread->isLastWindow();
+}
+
+
 void CvWindow::icvLoadControlPanel()
 {
     QSettings settings("OpenCV2", QFileInfo(QApplication::applicationFilePath()).fileName() + " control panel");
@@ -2859,6 +2861,7 @@ void DefaultViewPort::stopDisplayInfo()
 {
     timerDisplay->stop();
     drawInfo = false;
+    viewport()->update();
 }
 
 

modules/highgui/src/window_QT.h

@@ -298,7 +298,6 @@ class CvWindow : public CvWinModel
     Q_OBJECT
 public:
     CvWindow(QString arg2, int flag = cv::WINDOW_NORMAL);
-    ~CvWindow();
 
     void setMouseCallBack(CvMouseCallback m, void* param);
 
@@ -349,6 +348,7 @@ public:
 
 protected:
     virtual void keyPressEvent(QKeyEvent* event) CV_OVERRIDE;
+    virtual void closeEvent(QCloseEvent* event) CV_OVERRIDE;
 
 private: