From 25dcc90d799fba3e3f0391783ed07cb22cd1115a Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Fri, 30 Oct 2015 09:43:45 +0100 Subject: winrt: Exit application properly After returning from main() it is not sufficient to exit the main thread, it also needs to be ensured that the Xaml::IApplication object gets notified by invoking Exit. Task-number: QTBUG-49141 Change-Id: I8ca434be5f17ddddd465ede2a79585c28c51b3ef Reviewed-by: Andrew Knight --- src/winmain/qtmain_winrt.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/winmain') diff --git a/src/winmain/qtmain_winrt.cpp b/src/winmain/qtmain_winrt.cpp index 3553d966d8..473c41ab8e 100644 --- a/src/winmain/qtmain_winrt.cpp +++ b/src/winmain/qtmain_winrt.cpp @@ -156,7 +156,9 @@ public: AppContainer *app = reinterpret_cast(param); int argc = app->args.count(); char **argv = app->args.data(); - return main(argc, argv); + const int res = main(argc, argv); + app->core->Exit(); + return res; }, this, CREATE_SUSPENDED, nullptr); HRESULT hr; -- cgit v1.2.3