feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.8'

Browse Source 
Conflicts:
	src/plugins/cpptools/compileroptionsbuilder.cpp

Change-Id: I743ea39480cc5c7b6febcd2e93713d15a3ae6d9c
This commit is contained in:
Eike Ziller
2018-12-07 08:53:11 +01:00
parent 9d708f776f 3e9d7d290c
commit e5c2ee922a
17 changed files with 151 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/languageclient/languageclientmanager.cpp
View File

@@ -205,10 +205,10 @@ void LanguageClientManager::reportFinished(const MessageId &id, BaseClient *byCl
void LanguageClientManager::deleteClient(BaseClient *client)
{
QTC_ASSERT(client, return);
client->disconnect(managerInstance);
client->disconnect();
managerInstance->removeMarks(client->id());
managerInstance->m_clients.removeAll(client);
delete client;
client->deleteLater();
}
void LanguageClientManager::shutdown()