[SCM] Qt 4 packaging branch, experimental-snapshots, updated. debian/4.7.3-1-7-g0470728

Fathi Boudra fabo at alioth.debian.org
Sat Jun 11 11:42:45 UTC 2011


The following commit has been merged in the experimental-snapshots branch:
commit 7a9f7d8bef70b970e1cb29f189d3cfd9a4cb4f72
Author: Frederik Schwarzer <schwarzerf at gmail.com>
Date:   Fri Dec 10 19:13:53 2010 +0100

    add upstream patch that fixes 4.7.1 backspace crash
---
 debian/changelog                                   |    6 ++++
 ...port_6ae84f1_fix_QTextEdit_selectAll_crash.diff |   32 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 39 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9883c0f..5c82b78 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,12 @@ qt4-x11 (4:4.7.1-2) UNRELEASED; urgency=low
   * Add appropriate Build-Depends-Package field to libqt4-declarative and
     libqt4-openvg symbol files.
 
+  [ Frederik Schwarzer ]
+  * Add upstream patch
+    0002_backport_6ae84f1_fix_QTextEdit_selectAll_crash.diff
+    that fixes a crash when using the backspace key under
+    various circumstances. (Closes: #606405)
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 06 Dec 2010 01:13:50 +0100
 
 qt4-x11 (4:4.7.1-1) experimental; urgency=low
diff --git a/debian/patches/0002_backport_6ae84f1_fix_QTextEdit_selectAll_crash.diff b/debian/patches/0002_backport_6ae84f1_fix_QTextEdit_selectAll_crash.diff
new file mode 100644
index 0000000..4a0dfb8
--- /dev/null
+++ b/debian/patches/0002_backport_6ae84f1_fix_QTextEdit_selectAll_crash.diff
@@ -0,0 +1,32 @@
+From 6ae84f1183e91c910ca92a55e37f8254ace805c0 Mon Sep 17 00:00:00 2001
+From: Jiang Jiang <jiang.jiang at nokia.com>
+Date: Mon, 6 Dec 2010 13:07:36 +0100
+Subject: [PATCH] Fix QTextEdit::selectAll crash from textChanged()
+
+Doing selectAll() after the entire block of text has been removed
+will cause this crash, because we didn't check if the block we
+found is valid or not.
+
+Task-number: QTBUG-15857
+Reviewed-by: Eskil
+---
+ src/gui/text/qtextcursor.cpp |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/src/gui/text/qtextcursor.cpp b/src/gui/text/qtextcursor.cpp
+index 769ab2f..f73cc4b 100644
+--- a/src/gui/text/qtextcursor.cpp
++++ b/src/gui/text/qtextcursor.cpp
+@@ -363,6 +363,9 @@ bool QTextCursorPrivate::movePosition(QTextCursor::MoveOperation op, QTextCursor
+     bool adjustX = true;
+     QTextBlock blockIt = block();
+ 
++    if (!blockIt.isValid())
++        return false;
++
+     if (op >= QTextCursor::Left && op <= QTextCursor::WordRight
+         && blockIt.textDirection() == Qt::RightToLeft) {
+         if (op == QTextCursor::Left)
+-- 
+1.6.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 7caec6e..722b9ef 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 # upstream patches
 0001_backport_e3f1268_alsa_buffer_overrun.diff
+0002_backport_6ae84f1_fix_QTextEdit_selectAll_crash.diff
 
 # qt-copy patches
 0195-compositing-properties.diff

-- 
Qt 4 packaging



More information about the pkg-kde-commits mailing list