diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2021-05-19 09:54:07 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2021-05-19 09:54:07 +0200 |
| commit | f83be6debe8fcf4a635fae0e755776fd12f85dae (patch) | |
| tree | fbf56dfee3c9142c0d1f3c7ad0718a8697d2d1b6 /src/plugins/cpptools/cpptoolstestcase.cpp | |
| parent | c49a0af5046157039da2194723e0fc4dd48956f5 (diff) | |
| parent | 801dbdf9324a67462eb6756f4ea49b31ae2074bb (diff) | |
| download | qt-creator-f83be6debe8fcf4a635fae0e755776fd12f85dae.tar.gz | |
Merge remote-tracking branch 'origin/4.15'
Change-Id: Ia6558fc2423fd9cd84ca2282bfa60d102dff682e
Diffstat (limited to 'src/plugins/cpptools/cpptoolstestcase.cpp')
| -rw-r--r-- | src/plugins/cpptools/cpptoolstestcase.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/cpptools/cpptoolstestcase.cpp b/src/plugins/cpptools/cpptoolstestcase.cpp index 7c138a1416..8a714b7df7 100644 --- a/src/plugins/cpptools/cpptoolstestcase.cpp +++ b/src/plugins/cpptools/cpptoolstestcase.cpp @@ -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); } |