diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2019-09-26 14:53:18 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2019-09-26 15:00:16 +0200 |
| commit | fd88c40291275032f730693facee6f7758bf5992 (patch) | |
| tree | 55269b9ab504ae7b7835232dd67aef1ce1deffea /src/lib/corelib/tools/joblimits.cpp | |
| parent | e86375117120f8c7b06afa573d9772d3c783f737 (diff) | |
| parent | 94fe404a5a6d7cf91926bcfbd026953994b25815 (diff) | |
Merge 1.14 into master
Change-Id: Ie432987ee2d3ccaa6e881b1b01f142185eddabd8
Diffstat (limited to 'src/lib/corelib/tools/joblimits.cpp')
| -rw-r--r-- | src/lib/corelib/tools/joblimits.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/corelib/tools/joblimits.cpp b/src/lib/corelib/tools/joblimits.cpp index 912b15a65..1a3e3a498 100644 --- a/src/lib/corelib/tools/joblimits.cpp +++ b/src/lib/corelib/tools/joblimits.cpp @@ -149,7 +149,7 @@ bool JobLimits::isEmpty() const int JobLimits::count() const { - return d->jobLimits.size(); + return int(d->jobLimits.size()); } JobLimit JobLimits::jobLimitAt(int i) const |