diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2021-05-05 14:53:00 +0200 |
|---|---|---|
| committer | Ivan Komissarov <abbapoh@gmail.com> | 2021-05-05 14:53:00 +0200 |
| commit | b69f1a4fbfbf6fed4ffc42d6191082b6a20af828 (patch) | |
| tree | 4ed0c8c083d376261a9a0c5f3c8908b9de679ca8 /src | |
| parent | 1c3e61227d7e474bd56cc38fdc259f3cc5d3a661 (diff) | |
| parent | 86eb6974126b4fdf4cfa3340b7a80833479f2d37 (diff) | |
Merge branch '1.19' into master
Change-Id: Id2691bd6a49ca6c2886cf5f460351e3d1daad9e6
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/corelib/language/projectresolver.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/corelib/language/projectresolver.cpp b/src/lib/corelib/language/projectresolver.cpp index 4ae5f3ca7..829cc955a 100644 --- a/src/lib/corelib/language/projectresolver.cpp +++ b/src/lib/corelib/language/projectresolver.cpp @@ -232,7 +232,7 @@ static void makeSubProjectNamesUniqe(const ResolvedProjectPtr &parentProject) TopLevelProjectPtr ProjectResolver::resolveTopLevelProject() { if (m_progressObserver) - m_progressObserver->setMaximum(m_loadResult.productInfos.size()); + m_progressObserver->setMaximum(int(m_loadResult.productInfos.size())); const TopLevelProjectPtr project = TopLevelProject::create(); project->buildDirectory = TopLevelProject::deriveBuildDirectory(m_setupParams.buildRoot(), TopLevelProject::deriveId(m_setupParams.finalBuildConfigurationTree())); |