diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-14 01:00:09 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-14 01:00:09 +0200 |
| commit | 1632786f00875d23c7d111cbb29dedaa35c1c8c2 (patch) | |
| tree | f22a5bca4e8ec6f513ca4c9d83fc8c94594ec1f1 /src/gui | |
| parent | df9f9fb368cc2dc17c57030e1df51804c2f2265d (diff) | |
| parent | 2a9cf3aeab8927d73adc3d63fc7bf97e0edda41a (diff) | |
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/text/qfont.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp index a51e98ce85..1dbb03948d 100644 --- a/src/gui/text/qfont.cpp +++ b/src/gui/text/qfont.cpp @@ -3044,7 +3044,7 @@ void QFontCache::decreaseCache() it.value().data->ref.load(), engineCacheCount.value(it.value().data), it.value().data->cache_cost); - if (it.value().data->ref.load() != 0) + if (it.value().data->ref.load() > engineCacheCount.value(it.value().data)) in_use_cost += it.value().data->cache_cost / engineCacheCount.value(it.value().data); } |