diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-21 08:17:21 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-21 08:17:21 +0100 |
| commit | 158a3a4159bdc5a49caecd63e021dacbc06cf23c (patch) | |
| tree | c3ed9aee6cabd46e5e8615b3815b92d32857c4da /src/gui/text/qfont_p.h | |
| parent | 26ece94a68fb5ae680c5639716b06c4e1ae979a8 (diff) | |
| parent | 7b2fb038ae4b8b9231ae989ad309b6eca107a858 (diff) | |
| download | qtbase-158a3a4159bdc5a49caecd63e021dacbc06cf23c.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/corelib/io/qiodevice_p.h
src/corelib/kernel/qvariant_p.h
src/corelib/tools/qsimd.cpp
src/gui/kernel/qguiapplication.cpp
tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
Change-Id: I742a093cbb231b282b43e463ec67173e0d29f57a
Diffstat (limited to 'src/gui/text/qfont_p.h')
| -rw-r--r-- | src/gui/text/qfont_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/text/qfont_p.h b/src/gui/text/qfont_p.h index 2d90f79cbd..3979bb27ac 100644 --- a/src/gui/text/qfont_p.h +++ b/src/gui/text/qfont_p.h @@ -282,6 +282,7 @@ private: void increaseCost(uint cost); void decreaseCost(uint cost); void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE; + void decreaseCache(); static const uint min_cost; uint total_cost, max_cost; |