examples: Connect Quit action to QCoreApplication::quit, not QWidget::close

Change-Id: I44ca7b61a4a261a7d3aad0dfeb870eb927ee768d
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 850ef55fc57e62b70bab72705038e671002ca86e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Tor Arne Vestbø 2023-02-20 11:18:35 +01:00 committed by Qt Cherry-pick Bot
parent 8bcf236daa
commit efe740e03b
10 changed files with 11 additions and 10 deletions

View File

@ -5,6 +5,7 @@
#include <QPushButton> #include <QPushButton>
#include <QUdpSocket> #include <QUdpSocket>
#include <QVBoxLayout> #include <QVBoxLayout>
#include <QCoreApplication>
#include "receiver.h" #include "receiver.h"
@ -26,7 +27,7 @@ Receiver::Receiver(QWidget *parent)
this, &Receiver::processPendingDatagrams); this, &Receiver::processPendingDatagrams);
//! [1] //! [1]
connect(quitButton, &QPushButton::clicked, connect(quitButton, &QPushButton::clicked,
this, &Receiver::close); qApp, &QCoreApplication::quit);
auto buttonLayout = new QHBoxLayout; auto buttonLayout = new QHBoxLayout;
buttonLayout->addStretch(1); buttonLayout->addStretch(1);

View File

@ -25,7 +25,7 @@ Sender::Sender(QWidget *parent)
//! [0] //! [0]
connect(startButton, &QPushButton::clicked, this, &Sender::startBroadcasting); 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); connect(&timer, &QTimer::timeout, this, &Sender::broadcastDatagram);
auto mainLayout = new QVBoxLayout; auto mainLayout = new QVBoxLayout;

View File

@ -25,7 +25,7 @@ Dialog::Dialog(QWidget *parent)
buttonBox->addButton(quitButton, QDialogButtonBox::RejectRole); buttonBox->addButton(quitButton, QDialogButtonBox::RejectRole);
connect(startButton, &QAbstractButton::clicked, this, &Dialog::start); 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, connect(&tcpServer, &QTcpServer::newConnection,
this, &Dialog::acceptConnection); this, &Dialog::acceptConnection);
connect(&tcpClient, &QAbstractSocket::connected, this, &Dialog::startTransfer); connect(&tcpClient, &QAbstractSocket::connected, this, &Dialog::startTransfer);

View File

@ -38,7 +38,7 @@ Receiver::Receiver(QWidget *parent)
connect(&udpSocket6, &QUdpSocket::readyRead, connect(&udpSocket6, &QUdpSocket::readyRead,
this, &Receiver::processPendingDatagrams); this, &Receiver::processPendingDatagrams);
connect(quitButton, &QPushButton::clicked, connect(quitButton, &QPushButton::clicked,
this, &Receiver::close); qApp, &QCoreApplication::quit);
} }
void Receiver::processPendingDatagrams() void Receiver::processPendingDatagrams()

View File

@ -111,7 +111,7 @@ void BookWindow::createMenuBar()
helpMenu->addAction(aboutAction); helpMenu->addAction(aboutAction);
helpMenu->addAction(aboutQtAction); 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(aboutAction, &QAction::triggered, this, &BookWindow::about);
connect(aboutQtAction, &QAction::triggered, qApp, &QApplication::aboutQt); connect(aboutQtAction, &QAction::triggered, qApp, &QApplication::aboutQt);
} }

View File

@ -341,7 +341,7 @@ void MainWindow::createMenuBar()
connect(deleteAction, &QAction::triggered, connect(deleteAction, &QAction::triggered,
this, &MainWindow::deleteAlbum); this, &MainWindow::deleteAlbum);
connect(quitAction, &QAction::triggered, connect(quitAction, &QAction::triggered,
this, &MainWindow::close); qApp, &QCoreApplication::quit);
connect(aboutAction, &QAction::triggered, connect(aboutAction, &QAction::triggered,
this, &MainWindow::about); this, &MainWindow::about);
connect(aboutQtAction, &QAction::triggered, connect(aboutQtAction, &QAction::triggered,

View File

@ -215,7 +215,7 @@ void MainWindow::createActions()
fileMenu->addSeparator(); 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->setShortcuts(QKeySequence::Quit);
quitAct->setStatusTip(tr("Quit the application")); quitAct->setStatusTip(tr("Quit the application"));

View File

@ -93,7 +93,7 @@ void MainWindow::setupMenuBar()
menu->addAction(tr("Switch layout direction"),this, &MainWindow::switchLayoutDirection); menu->addAction(tr("Switch layout direction"),this, &MainWindow::switchLayoutDirection);
menu->addSeparator(); menu->addSeparator();
menu->addAction(tr("&Quit"), this, &QWidget::close); menu->addAction(tr("&Quit"), qApp, &QCoreApplication::quit);
mainWindowMenu = menuBar()->addMenu(tr("Main window")); mainWindowMenu = menuBar()->addMenu(tr("Main window"));

View File

@ -171,7 +171,7 @@ void TextEdit::setupFileActions()
menu->addSeparator(); menu->addSeparator();
#endif #endif
a = menu->addAction(tr("&Quit"), this, &QWidget::close); a = menu->addAction(tr("&Quit"), qApp, &QCoreApplication::quit);
a->setShortcut(Qt::CTRL | Qt::Key_Q); a->setShortcut(Qt::CTRL | Qt::Key_Q);
} }

View File

@ -417,7 +417,7 @@ void MainWindow::createActions()
fileMenu->addSeparator(); fileMenu->addSeparator();
QAction *exitAct = fileMenu->addAction(tr("&Quit"), this, &QWidget::close); QAction *exitAct = fileMenu->addAction(tr("&Quit"), qApp, &QCoreApplication::quit);
exitAct->setShortcuts(QKeySequence::Quit); exitAct->setShortcuts(QKeySequence::Quit);
QMenu *viewMenu = menuBar()->addMenu(tr("&View")); QMenu *viewMenu = menuBar()->addMenu(tr("&View"));