equal
deleted
inserted
replaced
2610 QT_TRY { |
2610 QT_TRY { |
2611 cache = theFontCache(); |
2611 cache = theFontCache(); |
2612 } QT_CATCH (const std::bad_alloc &) { |
2612 } QT_CATCH (const std::bad_alloc &) { |
2613 // no cache - just ignore |
2613 // no cache - just ignore |
2614 } |
2614 } |
2615 if (cache && cache->hasLocalData()) |
2615 if (cache && cache->hasLocalData()) { |
|
2616 cache->localData()->clear(); |
2616 cache->setLocalData(0); |
2617 cache->setLocalData(0); |
|
2618 } |
2617 } |
2619 } |
2618 #endif // QT_NO_THREAD |
2620 #endif // QT_NO_THREAD |
2619 |
2621 |
2620 QFontCache::QFontCache() |
2622 QFontCache::QFontCache() |
2621 : QObject(), total_cost(0), max_cost(min_cost), |
2623 : QObject(), total_cost(0), max_cost(min_cost), |