[SCM] Qt 4 Debian packaging branch, experimental-snapshots, updated. debian/4.6.2-5-2-gd3ee0a2
Fathi Boudra
fabo at alioth.debian.org
Fri May 21 07:59:02 UTC 2010
The following commit has been merged in the experimental-snapshots branch:
commit 6aa353be12f338db976d0e0f18e15db9395b69f8
Author: Fathi Boudra <fabo at debian.org>
Date: Wed Apr 21 13:15:30 2010 +0300
Add upstream patches:
- 0004_problem_displaying_half_width_character.diff (Closes: #578604)
QTBUG-1726 - Fixed problem displaying half width character as full
width.
- 0005_always_redraw_the_complete_control.diff (Closes: #578606)
QTBUG-8807 - Always redraw the complete control when an input event
comes in.
---
debian/changelog | 11 ++++-
...04_problem_displaying_half_width_character.diff | 38 +++++++++++++
.../0005_always_redraw_the_complete_control.diff | 56 ++++++++++++++++++++
debian/patches/series | 2 +
4 files changed, 106 insertions(+), 1 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 05fac7a..136d883 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,19 @@
qt4-x11 (4:4.6.2-5) UNRELEASED; urgency=low
+ [ Modestas Vainius ]
* Update symbol files for armel, hppa and mips.
* Add support for alpha to QtScript copy of wtf/Platform.h. This change
should fix FTBFS on alpha (patch 52_wtf_platform_support_alpha.diff).
- -- Modestas Vainius <modax at debian.org> Sun, 18 Apr 2010 23:42:13 +0300
+ [ Fathi Boudra ]
+ * Add upstream patches:
+ - 0004_problem_displaying_half_width_character.diff (Closes: #578604)
+ QTBUG-1726 - Fixed problem displaying half width character as full width.
+ - 0005_always_redraw_the_complete_control.diff (Closes: #578606)
+ QTBUG-8807 - Always redraw the complete control when an input event comes
+ in.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sun, 18 Apr 2010 23:42:13 +0300
qt4-x11 (4:4.6.2-4) unstable; urgency=low
diff --git a/debian/patches/0004_problem_displaying_half_width_character.diff b/debian/patches/0004_problem_displaying_half_width_character.diff
new file mode 100644
index 0000000..083df62
--- /dev/null
+++ b/debian/patches/0004_problem_displaying_half_width_character.diff
@@ -0,0 +1,38 @@
+From f18e95849be93b86ff014147086fa538993abc21 Mon Sep 17 00:00:00 2001
+From: Daisuke Kameda <daisuke at kde.gr.jp>
+Date: Thu, 11 Mar 2010 13:39:15 +0100
+Subject: [PATCH] Fixed problem displaying half width character as full width
+
+There is the problem that Qt displays half width character
+(e.g. alphabet) as full width. This is reported in #QTBUG-1726.
+
+This occurs in the following fonts.
+ - Monospace font
+ - Selif font
+ - IPA font (Ver.0301)
+ - NSimSun
+
+In Cario and fontconfig, the FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH
+is specified as flag of FT_Load_Glyph function to solve this problem.
+According to the document of freetype, this flag exists to support
+buggy CJK fonts.
+
+So this flag is specified as default flag of QFontEngineFT.
+
+Merge-request: 2319
+Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt at nokia.com>
+---
+ src/gui/text/qfontengine_ft.cpp | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+--- a/src/gui/text/qfontengine_ft.cpp
++++ b/src/gui/text/qfontengine_ft.cpp
+@@ -619,7 +619,7 @@ QFontEngineFT::QFontEngineFT(const QFont
+ transform = false;
+ antialias = true;
+ freetype = 0;
+- default_load_flags = 0;
++ default_load_flags = FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH;
+ default_hint_style = HintNone;
+ subpixelType = Subpixel_None;
+ lcdFilterType = 0;
diff --git a/debian/patches/0005_always_redraw_the_complete_control.diff b/debian/patches/0005_always_redraw_the_complete_control.diff
new file mode 100644
index 0000000..53380cc
--- /dev/null
+++ b/debian/patches/0005_always_redraw_the_complete_control.diff
@@ -0,0 +1,56 @@
+From 9b4ca998930c7b81b72e5068b3ebae33907ac4b2 Mon Sep 17 00:00:00 2001
+From: Robert Griebl <rgriebl at trolltech.com>
+Date: Wed, 27 Jan 2010 15:54:25 +0100
+Subject: [PATCH] Always redraw the complete control when an input event comes in.
+
+The problem here is that a pre-edit string won't be detected by
+updateDisplayText(), so the control thinks nothing has changed when
+a new pre-edit string is set.
+
+Reviewed-By: Simon Hausmann
+(cherry picked from commit 16f30906f6eea3e00351478555f153697a6e186d)
+---
+ src/gui/widgets/qlinecontrol.cpp | 6 +++---
+ src/gui/widgets/qlinecontrol_p.h | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+--- a/src/gui/widgets/qlinecontrol.cpp
++++ b/src/gui/widgets/qlinecontrol.cpp
+@@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE
+ Updates the display text based of the current edit text
+ If the text has changed will emit displayTextChanged()
+ */
+-void QLineControl::updateDisplayText()
++void QLineControl::updateDisplayText(bool forceUpdate)
+ {
+ QString orig = m_textLayout.text();
+ QString str;
+@@ -102,7 +102,7 @@ void QLineControl::updateDisplayText()
+ m_textLayout.endLayout();
+ m_ascent = qRound(l.ascent());
+
+- if (str != orig)
++ if (str != orig || forceUpdate)
+ emit displayTextChanged(str);
+ }
+
+@@ -476,7 +476,7 @@ void QLineControl::processInputMethodEve
+ }
+ }
+ m_textLayout.setAdditionalFormats(formats);
+- updateDisplayText();
++ updateDisplayText(/*force*/ true);
+ if (cursorPositionChanged)
+ emitCursorPositionChanged();
+ if (isGettingInput)
+--- a/src/gui/widgets/qlinecontrol_p.h
++++ b/src/gui/widgets/qlinecontrol_p.h
+@@ -239,7 +239,7 @@ private:
+ void init(const QString &txt);
+ void removeSelectedText();
+ void internalSetText(const QString &txt, int pos = -1, bool edited = true);
+- void updateDisplayText();
++ void updateDisplayText(bool forceUpdate = false);
+
+ void internalInsert(const QString &s);
+ void internalDelete(bool wasBackspace = false);
diff --git a/debian/patches/series b/debian/patches/series
index 842114d..5bea16b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,6 +2,8 @@
0001_qpixmap_load_no_modify_referenced_copies.diff
0002_qmake_qfileinfo_absolutepath.diff
0003_s390_fix_atomic_ops_related_crashes.diff
+0004_problem_displaying_half_width_character.diff
+0005_always_redraw_the_complete_control.diff
# qt-copy patches
0180-window-role.diff
--
Qt 4 Debian packaging
More information about the pkg-kde-commits
mailing list