diff options
Diffstat (limited to 'src/gui/text/qfont.cpp')
-rw-r--r-- | src/gui/text/qfont.cpp | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp index f7462b65c8..69255fd59d 100644 --- a/src/gui/text/qfont.cpp +++ b/src/gui/text/qfont.cpp @@ -1254,7 +1254,7 @@ QFont::StyleStrategy QFont::styleStrategy() const /*! Returns the StyleHint. - The style hint affects the \l{#fontmatching}{font matching algorithm}. + The style hint affects the \l{QFont#fontmatching}{font matching algorithm}. See \l QFont::StyleHint for the list of available hints. \sa setStyleHint(), QFont::StyleStrategy, QFontInfo::styleHint() @@ -2703,18 +2703,6 @@ static const int slow_timeout = 300000; // 5m const uint QFontCache::min_cost = 4*1024; // 4mb -#ifdef QT_NO_THREAD -Q_GLOBAL_STATIC(QFontCache, theFontCache) - -QFontCache *QFontCache::instance() -{ - return theFontCache(); -} - -void QFontCache::cleanup() -{ -} -#else Q_GLOBAL_STATIC(QThreadStorage<QFontCache *>, theFontCache) QFontCache *QFontCache::instance() @@ -2736,7 +2724,6 @@ void QFontCache::cleanup() if (cache && cache->hasLocalData()) cache->setLocalData(0); } -#endif // QT_NO_THREAD QBasicAtomicInt font_cache_id = Q_BASIC_ATOMIC_INITIALIZER(1); |