Commit 3065b029 authored by Denis Mingulov's avatar Denis Mingulov Committed by Tobias Hunger

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

Merge-request: 179
Reviewed-by: default avatarTobias Hunger <tobias.hunger@nokia.com>
parent 99293bb2
......@@ -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();
}
......@@ -262,7 +262,6 @@ void PluginManager::shutdown()
d->shutdown();
}
/*!
\fn QStringList PluginManager::pluginPaths() const
The list of paths were the plugin manager searches for plugins.
......
......@@ -93,7 +93,6 @@ public:
// Plugin operations
QList<PluginSpec *> loadQueue();
void loadPlugins();
void shutdown();
QStringList pluginPaths() const;
void setPluginPaths(const QStringList &paths);
QList<PluginSpec *> plugins() const;
......@@ -130,6 +129,7 @@ signals:
public slots:
void remoteArguments(const QString &serializedArguments);
void shutdown();
private slots:
void startTests();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment