From 947188b969d14dd37c1c8b00b0b9c572cdd6cfac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Mon, 11 Oct 2021 15:57:46 +0200 Subject: Fix references to QGuiApplication::lastWindowClosed The signal is emitted from QGuiApplication these days. Pick-to: 6.2 Change-Id: I7423cd4808e8df86960f225fd6e4a12a1a4f11f3 Reviewed-by: Doris Verria Reviewed-by: Volker Hilsheimer --- tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp | 4 ++-- tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/auto/widgets/kernel') diff --git a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp index 8216cfbab0..e5ac69a00b 100644 --- a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp +++ b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp @@ -792,7 +792,7 @@ void tst_QApplication::quitOnLastWindowClosed() { int argc = 0; QApplication app(argc, nullptr); - QSignalSpy appSpy(&app, &QApplication::lastWindowClosed); + QSignalSpy appSpy(&app, &QGuiApplication::lastWindowClosed); // exec a dialog for 1 second, then show the window QuitOnLastWindowClosedWindow window; @@ -1335,7 +1335,7 @@ void tst_QApplication::testDeleteLater() #endif int argc = 0; QApplication app(argc, nullptr); - connect(&app, &QApplication::lastWindowClosed, &app, &QCoreApplication::quit); + connect(&app, &QGuiApplication::lastWindowClosed, &app, &QCoreApplication::quit); DeleteLaterWidget *wgt = new DeleteLaterWidget(&app); QTimer::singleShot(500, wgt, &DeleteLaterWidget::runTest); diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp index 3f73b2ff26..a7c3f86687 100644 --- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp +++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp @@ -12225,7 +12225,7 @@ void tst_QWidget::deleteWindowInCloseEvent() */ void tst_QWidget::quitOnClose() { - QSignalSpy quitSpy(qApp, &QApplication::lastWindowClosed); + QSignalSpy quitSpy(qApp, &QGuiApplication::lastWindowClosed); std::unique_ptrwidget(new QWidget); widget->show(); -- cgit v1.2.3