diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-04-29 09:14:55 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-04-29 09:14:55 +0200 |
| commit | a7dbf8a92f18fb77cb74d46da58ddd36f02bcb1f (patch) | |
| tree | 60bdaad752e380a590341a31c6d825c5e26f6930 | |
| parent | 425fe5978bd958cd3788ccb80562f6fabe0d8493 (diff) | |
| parent | fc5028ffa6ac5720ed3c47787a92a761b0d270cf (diff) | |
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
| -rw-r--r-- | src/declarative/scenegraph/qsgdistancefieldglyphcache.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/declarative/scenegraph/qsgdistancefieldglyphcache.cpp b/src/declarative/scenegraph/qsgdistancefieldglyphcache.cpp index 957632c46f..c40df75084 100644 --- a/src/declarative/scenegraph/qsgdistancefieldglyphcache.cpp +++ b/src/declarative/scenegraph/qsgdistancefieldglyphcache.cpp @@ -481,7 +481,6 @@ static void convert_to_Format_Alpha(QImage *image) static bool fontHasNarrowOutlines(const QRawFont &f) { - return true; QRawFont font = f; font.setPixelSize(QT_DISTANCEFIELD_DEFAULT_BASEFONTSIZE); Q_ASSERT(font.isValid()); |