From 850ef55fc57e62b70bab72705038e671002ca86e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Mon, 20 Feb 2023 11:18:35 +0100 Subject: examples: Connect Quit action to QCoreApplication::quit, not QWidget::close Pick-to: 6.5 Change-Id: I44ca7b61a4a261a7d3aad0dfeb870eb927ee768d Reviewed-by: Volker Hilsheimer --- examples/network/broadcastreceiver/receiver.cpp | 3 ++- examples/network/broadcastsender/sender.cpp | 2 +- examples/network/loopback/dialog.cpp | 2 +- examples/network/multicastreceiver/receiver.cpp | 2 +- examples/sql/books/bookwindow.cpp | 2 +- examples/sql/masterdetail/mainwindow.cpp | 2 +- examples/widgets/mainwindows/dockwidgets/mainwindow.cpp | 2 +- examples/widgets/mainwindows/mainwindow/mainwindow.cpp | 2 +- examples/widgets/richtext/textedit/textedit.cpp | 2 +- examples/widgets/widgets/icons/mainwindow.cpp | 2 +- 10 files changed, 11 insertions(+), 10 deletions(-) (limited to 'examples') diff --git a/examples/network/broadcastreceiver/receiver.cpp b/examples/network/broadcastreceiver/receiver.cpp index caa05ac45a..ffade9992c 100644 --- a/examples/network/broadcastreceiver/receiver.cpp +++ b/examples/network/broadcastreceiver/receiver.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include "receiver.h" @@ -26,7 +27,7 @@ Receiver::Receiver(QWidget *parent) this, &Receiver::processPendingDatagrams); //! [1] connect(quitButton, &QPushButton::clicked, - this, &Receiver::close); + qApp, &QCoreApplication::quit); auto buttonLayout = new QHBoxLayout; buttonLayout->addStretch(1); diff --git a/examples/network/broadcastsender/sender.cpp b/examples/network/broadcastsender/sender.cpp index 7aa416ad6c..622d3f9616 100644 --- a/examples/network/broadcastsender/sender.cpp +++ b/examples/network/broadcastsender/sender.cpp @@ -25,7 +25,7 @@ Sender::Sender(QWidget *parent) //! [0] connect(startButton, &QPushButton::clicked, this, &Sender::startBroadcasting); - connect(quitButton, &QPushButton::clicked, this, &Sender::close); + connect(quitButton, &QPushButton::clicked, qApp, &QCoreApplication::quit); connect(&timer, &QTimer::timeout, this, &Sender::broadcastDatagram); auto mainLayout = new QVBoxLayout; diff --git a/examples/network/loopback/dialog.cpp b/examples/network/loopback/dialog.cpp index d1673d3338..f2391fd5b8 100644 --- a/examples/network/loopback/dialog.cpp +++ b/examples/network/loopback/dialog.cpp @@ -25,7 +25,7 @@ Dialog::Dialog(QWidget *parent) buttonBox->addButton(quitButton, QDialogButtonBox::RejectRole); connect(startButton, &QAbstractButton::clicked, this, &Dialog::start); - connect(quitButton, &QAbstractButton::clicked, this, &QWidget::close); + connect(quitButton, &QAbstractButton::clicked, qApp, &QCoreApplication::quit); connect(&tcpServer, &QTcpServer::newConnection, this, &Dialog::acceptConnection); connect(&tcpClient, &QAbstractSocket::connected, this, &Dialog::startTransfer); diff --git a/examples/network/multicastreceiver/receiver.cpp b/examples/network/multicastreceiver/receiver.cpp index 2a49553875..0ebeed8316 100644 --- a/examples/network/multicastreceiver/receiver.cpp +++ b/examples/network/multicastreceiver/receiver.cpp @@ -38,7 +38,7 @@ Receiver::Receiver(QWidget *parent) connect(&udpSocket6, &QUdpSocket::readyRead, this, &Receiver::processPendingDatagrams); connect(quitButton, &QPushButton::clicked, - this, &Receiver::close); + qApp, &QCoreApplication::quit); } void Receiver::processPendingDatagrams() diff --git a/examples/sql/books/bookwindow.cpp b/examples/sql/books/bookwindow.cpp index 6ec1b9e19a..2ec5459e1b 100644 --- a/examples/sql/books/bookwindow.cpp +++ b/examples/sql/books/bookwindow.cpp @@ -111,7 +111,7 @@ void BookWindow::createMenuBar() helpMenu->addAction(aboutAction); helpMenu->addAction(aboutQtAction); - connect(quitAction, &QAction::triggered, this, &BookWindow::close); + connect(quitAction, &QAction::triggered, qApp, &QCoreApplication::quit); connect(aboutAction, &QAction::triggered, this, &BookWindow::about); connect(aboutQtAction, &QAction::triggered, qApp, &QApplication::aboutQt); } diff --git a/examples/sql/masterdetail/mainwindow.cpp b/examples/sql/masterdetail/mainwindow.cpp index 9e4fa415af..d720db1033 100644 --- a/examples/sql/masterdetail/mainwindow.cpp +++ b/examples/sql/masterdetail/mainwindow.cpp @@ -341,7 +341,7 @@ void MainWindow::createMenuBar() connect(deleteAction, &QAction::triggered, this, &MainWindow::deleteAlbum); connect(quitAction, &QAction::triggered, - this, &MainWindow::close); + qApp, &QCoreApplication::quit); connect(aboutAction, &QAction::triggered, this, &MainWindow::about); connect(aboutQtAction, &QAction::triggered, diff --git a/examples/widgets/mainwindows/dockwidgets/mainwindow.cpp b/examples/widgets/mainwindows/dockwidgets/mainwindow.cpp index cd1189d8df..3493a66a67 100644 --- a/examples/widgets/mainwindows/dockwidgets/mainwindow.cpp +++ b/examples/widgets/mainwindows/dockwidgets/mainwindow.cpp @@ -215,7 +215,7 @@ void MainWindow::createActions() fileMenu->addSeparator(); - QAction *quitAct = fileMenu->addAction(tr("&Quit"), this, &QWidget::close); + QAction *quitAct = fileMenu->addAction(tr("&Quit"), qApp, &QCoreApplication::quit); quitAct->setShortcuts(QKeySequence::Quit); quitAct->setStatusTip(tr("Quit the application")); diff --git a/examples/widgets/mainwindows/mainwindow/mainwindow.cpp b/examples/widgets/mainwindows/mainwindow/mainwindow.cpp index f2ea0d0697..7af5914e1f 100644 --- a/examples/widgets/mainwindows/mainwindow/mainwindow.cpp +++ b/examples/widgets/mainwindows/mainwindow/mainwindow.cpp @@ -93,7 +93,7 @@ void MainWindow::setupMenuBar() menu->addAction(tr("Switch layout direction"),this, &MainWindow::switchLayoutDirection); menu->addSeparator(); - menu->addAction(tr("&Quit"), this, &QWidget::close); + menu->addAction(tr("&Quit"), qApp, &QCoreApplication::quit); mainWindowMenu = menuBar()->addMenu(tr("Main window")); diff --git a/examples/widgets/richtext/textedit/textedit.cpp b/examples/widgets/richtext/textedit/textedit.cpp index 5a4d62c646..fd2d4a8a16 100644 --- a/examples/widgets/richtext/textedit/textedit.cpp +++ b/examples/widgets/richtext/textedit/textedit.cpp @@ -171,7 +171,7 @@ void TextEdit::setupFileActions() menu->addSeparator(); #endif - a = menu->addAction(tr("&Quit"), this, &QWidget::close); + a = menu->addAction(tr("&Quit"), qApp, &QCoreApplication::quit); a->setShortcut(Qt::CTRL | Qt::Key_Q); } diff --git a/examples/widgets/widgets/icons/mainwindow.cpp b/examples/widgets/widgets/icons/mainwindow.cpp index 9c03401b6d..f893575f76 100644 --- a/examples/widgets/widgets/icons/mainwindow.cpp +++ b/examples/widgets/widgets/icons/mainwindow.cpp @@ -417,7 +417,7 @@ void MainWindow::createActions() fileMenu->addSeparator(); - QAction *exitAct = fileMenu->addAction(tr("&Quit"), this, &QWidget::close); + QAction *exitAct = fileMenu->addAction(tr("&Quit"), qApp, &QCoreApplication::quit); exitAct->setShortcuts(QKeySequence::Quit); QMenu *viewMenu = menuBar()->addMenu(tr("&View")); -- cgit v1.2.3