Commit 43a7947c authored by pvuorela's avatar pvuorela

Merge branch 'revert_dbus_exit_crash_fix' into 'mer-5.6'

[qtbase] Revert crash on exit fix. Contributes to JB#53350

See merge request !80
parents d69b2822 fe96a38e
......@@ -68,16 +68,6 @@ static void preventDllUnload();
Q_GLOBAL_STATIC(QDBusConnectionManager, _q_manager)
static void shutdownConnectionManager()
{
if (_q_manager.exists()) {
auto manager = _q_manager();
manager->quit();
manager->wait();
}
}
struct QDBusConnectionManager::ConnectionRequestData
{
enum RequestType {
......@@ -152,12 +142,12 @@ QDBusConnectionManager::QDBusConnectionManager()
#endif
defaultBuses[0] = defaultBuses[1] = Q_NULLPTR;
start();
qAddPostRoutine(shutdownConnectionManager);
}
QDBusConnectionManager::~QDBusConnectionManager()
{
quit();
wait();
}
QDBusConnectionManager* QDBusConnectionManager::instance()
......
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