diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2021-10-12 14:47:19 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2021-10-13 22:30:08 +0200 |
| commit | 954b58f3684431df5f39165023a9d216b92bbc80 (patch) | |
| tree | 65786c91f3668a216c9f66e7039d7f8244aeb9f7 | |
| parent | 947188b969d14dd37c1c8b00b0b9c572cdd6cfac (diff) | |
Remove unneeded function QGuiApplicationPrivate::emitLastWindowClosed
It only has a single call site nowadays.
Change-Id: I6f486dec51f76e1fb231fb7276bc8c856885bee1
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| -rw-r--r-- | src/gui/kernel/qguiapplication.cpp | 10 | ||||
| -rw-r--r-- | src/gui/kernel/qguiapplication_p.h | 2 |
2 files changed, 2 insertions, 10 deletions
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index 7e29d707ee..86ec5ad7b5 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -3559,7 +3559,8 @@ void QGuiApplicationPrivate::maybeQuitOnLastWindowClosed(QWindow *closedWindow) return; } - emitLastWindowClosed(); + if (in_exec) + emit q_func()->lastWindowClosed(); if (QGuiApplication::quitOnLastWindowClosed()) maybeQuit(); @@ -3577,13 +3578,6 @@ void QGuiApplicationPrivate::maybeQuitOnLastWindowClosed(QWindow *closedWindow) \sa QWindow::close(), QWindow::isTopLevel() */ -void QGuiApplicationPrivate::emitLastWindowClosed() -{ - if (qGuiApp && qGuiApp->d_func()->in_exec) { - emit qGuiApp->lastWindowClosed(); - } -} - bool QGuiApplicationPrivate::shouldQuit() { const QWindowList processedWindows; diff --git a/src/gui/kernel/qguiapplication_p.h b/src/gui/kernel/qguiapplication_p.h index 3450c6e36b..1c66e007db 100644 --- a/src/gui/kernel/qguiapplication_p.h +++ b/src/gui/kernel/qguiapplication_p.h @@ -205,8 +205,6 @@ public: return alignment; } - static void emitLastWindowClosed(); - QPixmap getPixmapCursor(Qt::CursorShape cshape); void _q_updateFocusObject(QObject *object); |