[SCM] qtbase packaging branch, kubuntu_unstable, updated. debian/5.5.0+dfsg-4-47-gc387b32

[Rohan Garg]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=e938515

The following commit has been merged in the kubuntu_unstable branch:
commit e93851571669b40fc8f9e7c2b8416c8ec892f483
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Mon Aug 17 11:04:43 2015 +0000

    Forward port enable_fonts_always_smoothly.patch (LP: #1475205)
---
 debian/changelog                                  |  9 ++++++++
 debian/patches/enable_fonts_always_smoothly.patch | 26 +++++++++++++++++++++++
 debian/patches/series                             |  1 +
 3 files changed, 36 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 60349d8..4916042 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -63,6 +63,15 @@ qtbase-opensource-src (5.4.2+dfsg-3) experimental; urgency=medium
 
  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Mon, 22 Jun 2015 09:59:21 -0300
 
+qtbase-opensource-src (5.4.2+dfsg-2ubuntu3) trusty; urgency=medium
+
+  [ Gary Wang ]
+  * debian/patches/enable_fonts_always_smoothly.patch:
+    - Workaround a glyph rendering problem by forcing distance field 
+      rendering (LP: #1462982) (LP: #1475205)
+
+ -- Timo Jyrinki <timo.jyrinki at iki.fi>  Wed, 05 Aug 2015 11:44:25 +0300
+
 qtbase-opensource-src (5.4.2+dfsg-2ubuntu2.1) wily; urgency=medium
 
   * Rebuild for ICU 55.1.
diff --git a/debian/patches/enable_fonts_always_smoothly.patch b/debian/patches/enable_fonts_always_smoothly.patch
new file mode 100644
index 0000000..16df954
--- /dev/null
+++ b/debian/patches/enable_fonts_always_smoothly.patch
@@ -0,0 +1,26 @@
+=== modified file 'src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp'
+--- a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp	2013-05-03 09:40:08 +0000
++++ b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp	2015-08-04 11:02:35 +0000
+@@ -813,6 +813,11 @@
+     return QFont(resolved);
+ }
+ 
++bool QFontconfigDatabase::fontsAlwaysScalable() const
++{
++    return true;
++}
++
+ void QFontconfigDatabase::setupFontEngine(QFontEngineFT *engine, const QFontDef &fontDef) const
+ {
+     bool antialias = !(fontDef.styleStrategy & QFont::NoAntialias);
+=== modified file 'src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase_p.h'
+--- a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase_p.h	2013-05-03 09:40:08 +0000
++++ b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase_p.h	2015-08-04 11:03:32 +0000
+@@ -57,6 +57,7 @@
+     QStringList addApplicationFont(const QByteArray &fontData, const QString &fileName) Q_DECL_OVERRIDE;
+     QString resolveFontFamilyAlias(const QString &family) const Q_DECL_OVERRIDE;
+     QFont defaultFont() const Q_DECL_OVERRIDE;
++    bool fontsAlwaysScalable() const Q_DECL_OVERRIDE;
+ 
+ private:
+     void setupFontEngine(QFontEngineFT *engine, const QFontDef &fontDef) const;
diff --git a/debian/patches/series b/debian/patches/series
index 1bcf0d0..b77e8d7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,3 +16,4 @@ Add-workaround-for-GL-on-Android-emulator.patch
 enable-tests.patch
 qopenglframebufferobject_powervrworkaround.patch
 disable-generic-plugin-when-others-available.patch
+enable_fonts_always_smoothly.patch

-- 
qtbase packaging