Merge pull request #27170 from Osse:qt-fix-closing-window

asmorkalov · web-flow · commit d0c5a04ddbef · 2025-03-31T08:58:23.000+03:00
Fix closing of windows when using the Qt backend
diff --git a/modules/highgui/src/window_QT.cpp b/modules/highgui/src/window_QT.cpp
@@ -859,7 +859,7 @@ void GuiReceiver::isLastWindow()
         delete guiMainThread;//delete global_control_panel too
         guiMainThread = NULL;
 
-        if (!doesExternalQAppExist)
+        if (doesExternalQAppExist)
         {
             qApp->quit();
         }
@@ -1739,13 +1739,6 @@ CvWindow::CvWindow(QString name, int arg2)
 }
 
 
-CvWindow::~CvWindow()
-{
-    if (guiMainThread)
-        guiMainThread->isLastWindow();
-}
-
-
 void CvWindow::setMouseCallBack(CvMouseCallback callback, void* param)
 {
     myView->setMouseCallBack(callback, param);
@@ -2259,6 +2252,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");
diff --git a/modules/highgui/src/window_QT.h b/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 @@ class CvWindow : public CvWinModel
 
 protected:
     virtual void keyPressEvent(QKeyEvent* event) CV_OVERRIDE;
+    virtual void closeEvent(QCloseEvent* event) CV_OVERRIDE;
 
 private:
 

Original file line number	Diff line number	Diff line change
`@@ -859,7 +859,7 @@ void GuiReceiver::isLastWindow()`
`859`	`859`	`delete guiMainThread;//delete global_control_panel too`
`860`	`860`	`guiMainThread = NULL;`
`861`	`861`
`862`		`- if (!doesExternalQAppExist)`
	`862`	`+ if (doesExternalQAppExist)`
`863`	`863`	`{`
`864`	`864`	`qApp->quit();`
`865`	`865`	`}`
`@@ -1739,13 +1739,6 @@ CvWindow::CvWindow(QString name, int arg2)`
`1739`	`1739`	`}`
`1740`	`1740`
`1741`	`1741`
`1742`		`-CvWindow::~CvWindow()`
`1743`		`-{`
`1744`		`- if (guiMainThread)`
`1745`		`- guiMainThread->isLastWindow();`
`1746`		`-}`
`1747`		`-`
`1748`		`-`
`1749`	`1742`	`void CvWindow::setMouseCallBack(CvMouseCallback callback, void* param)`
`1750`	`1743`	`{`
`1751`	`1744`	`myView->setMouseCallBack(callback, param);`
`@@ -2259,6 +2252,15 @@ void CvWindow::keyPressEvent(QKeyEvent *evnt)`
`2259`	`2252`	`}`
`2260`	`2253`
`2261`	`2254`
	`2255`	`+void CvWindow::closeEvent(QCloseEvent* evnt)`
	`2256`	`+{`
	`2257`	`+ QWidget::closeEvent(evnt);`
	`2258`	`+`
	`2259`	`+ if (guiMainThread)`
	`2260`	`+ guiMainThread->isLastWindow();`
	`2261`	`+}`
	`2262`	`+`
	`2263`	`+`
`2262`	`2264`	`void CvWindow::icvLoadControlPanel()`
`2263`	`2265`	`{`
`2264`	`2266`	`QSettings settings("OpenCV2", QFileInfo(QApplication::applicationFilePath()).fileName() + " control panel");`