QApplication::aboutToQuit signal is used for the plugin manager's shutdown

Merge-request: 179
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

1 files changed, 4 insertions, 3 deletions

diff --git a/src/app/main.cpp b/src/app/main.cpp
index afc08fc456..a453325a55 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -317,11 +317,12 @@ int main(int argc, char **argv)
     }
     QObject::connect(&app, SIGNAL(fileOpenRequest(QString)), coreplugin->plugin(), SLOT(fileOpenRequest(QString)));
 
+    // shutdown plugin manager on the exit
+    QObject::connect(&app, SIGNAL(aboutToQuit()), &pluginManager, SLOT(shutdown()));
+
     // Do this after the event loop has started
     QTimer::singleShot(100, &pluginManager, SLOT(startTests()));
 
-    int ret = app.exec();
-    pluginManager.shutdown();
-    return ret;
+    return app.exec();
 }