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

Merge remote-tracking branch 'origin/5.0'

Browse Source 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/android/androidconfigurations.cpp

Change-Id: Icd2b0fda2b2653656285bbbe457c30c9cd414d3f
This commit is contained in:
Eike Ziller
2021-08-30 10:53:27 +02:00
parent c145f95952 263d8fb5d7
commit 987ad3fe9c
44 changed files with 263 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -166,9 +166,8 @@ Client *LanguageClientManager::startClient(BaseSettings *setting, ProjectExplore
QTC_ASSERT(managerInstance, return nullptr);
QTC_ASSERT(setting, return nullptr);
QTC_ASSERT(setting->isValid(), return nullptr);
Client *client = setting->createClient();
Client *client = setting->createClient(project);
QTC_ASSERT(client, return nullptr);
client->setCurrentProject(project);
client->start();
managerInstance->m_clientsForSetting[setting->m_id].append(client);
return client;