Merge remote-tracking branch 'origin/4.15'

Change-Id: Ia6558fc2423fd9cd84ca2282bfa60d102dff682e
This commit is contained in:
Eike Ziller
2021-05-19 09:54:07 +02:00
21 changed files with 164 additions and 35 deletions

View File

@@ -234,8 +234,9 @@ bool TestCase::waitUntilProjectIsFullyOpened(Project *project, int timeOutInMs)
return QTest::qWaitFor(
[project]() {
return !SessionManager::startupBuildSystem()->isParsing()
&& CppModelManager::instance()->projectInfo(project).isValid();
return SessionManager::startupBuildSystem()
&& !SessionManager::startupBuildSystem()->isParsing()
&& CppModelManager::instance()->projectInfo(project).isValid();
},
timeOutInMs);
}