1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Store the font's scalability in QFontEngine."

Browse Source 
This reverts commit 65b12fbdb13d34c61bcadd5cc8fd6ee28a8dfafd.

QFontEngine is not always loaded from QFontDatabase, resulting in
the flag not being set.

Change-Id: I39bc5bd4a8dea153d191cfc55f4324195f75f64c
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
This commit is contained in:
Yoann Lopes 2013-11-22 18:45:49 +01:00 committed by The Qt Project
parent 94c17dce04
commit 4fbe50e77a
3 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/text/qfontdatabase_qpa.cpp
View File

@ -184,7 +184,6 @@ QFontEngine *loadSingleEngine(int script,
if (!engine) {
engine = pfdb->fontEngine(def, QChar::Script(script), size->handle);
if (engine) {
engine->smoothScalable = style->smoothScalable;
QFontCache::Key key(def,script);
QFontCache::instance()->instance()->insertEngine(key,engine);
}

3
src/gui/text/qfontengine.cpp
View File

@ -208,8 +208,7 @@ Q_AUTOTEST_EXPORT QList<QFontEngine *> QFontEngine_stopCollectingEngines()
QFontEngine::QFontEngine()
: ref(0),
font_(0), font_destroy_func(0),
face_(0), face_destroy_func(0),
smoothScalable(false)
face_(0), face_destroy_func(0)
{
cache_cost = 0;
fsType = 0;

2
src/gui/text/qfontengine_p.h
View File

@ -302,8 +302,6 @@ public:
inline QVariant userData() const { return m_userData; }
bool smoothScalable;
protected:
QFixed lastRightBearing(const QGlyphLayout &glyphs, bool round = false);