[SCM] Qt 4 Debian packaging branch, experimental-snapshots, updated. debian/4.6.0-1-14-g210c579

[Fathi Boudra]

The following commit has been merged in the experimental-snapshots branch:
commit 210c579ced0393271fe8448d398efc4bbe5e0326
Author: Fathi Boudra <fabo at kde.org>
Date:   Tue Jan 12 16:27:27 2010 +0100

    * Add cherry-picked patch 97_prevent_crash_on_inputcontext_creation.diff:
      Prevent a crash when creating an inputContext from the QApplication dtor.
    Note: not sure it will go in Qt 4.6.1
---
 debian/changelog                                   |    2 +
 .../97_prevent_crash_on_inputcontext_creation.diff |   39 ++++++++++++++++++++
 debian/patches/series                              |    2 +
 3 files changed, 43 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 599a8ba..1d2c0bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ qt4-x11 (4:4.6.0-2) UNRELEASED; urgency=low
   * Add 96_powerpc_no_gc_sections.diff: Don't pass -Wl,--gc-sections on powerpc
     when building libQtWebKit.so; works around a binutils bug that results in a
     segfault. Thanks to Steve Langasek.
+  * Add cherry-picked patch 97_prevent_crash_on_inputcontext_creation.diff:
+    Prevent a crash when creating an inputContext from the QApplication dtor.
   * Update debian/control:
     - build-depend on firebird2.1-dev instead of firebird2.0-dev.
       (Closes: #564683)
diff --git a/debian/patches/97_prevent_crash_on_inputcontext_creation.diff b/debian/patches/97_prevent_crash_on_inputcontext_creation.diff
new file mode 100644
index 0000000..8c5fb99
--- /dev/null
+++ b/debian/patches/97_prevent_crash_on_inputcontext_creation.diff
@@ -0,0 +1,39 @@
+From f72165460d27860cabd51691f4d935fd74b50f80 Mon Sep 17 00:00:00 2001
+From: Denis Dzyubenko <denis.dzyubenko at nokia.com>
+Date: Tue, 5 Jan 2010 13:42:49 +0100
+Subject: [PATCH] Prevent a crash when creating an inputContext from the QApplication dtor.
+
+When accessing the global input context from the QWidget destructor access it
+directly instead of calling a helper function.  Don't even bother to create an
+input context if QApplication is being destroyed (just in case if the user is
+calling the QApplication::inputContext manually from the destructor).
+
+Task-number: QTBUG-7105
+Reviewed-by: Simon Hausmann
+---
+ src/gui/kernel/qapplication.cpp |    2 ++
+ src/gui/kernel/qwidget_x11.cpp  |    2 +-
+ 2 files changed, 3 insertions(+), 1 deletions(-)
+
+--- a/src/gui/kernel/qapplication.cpp
++++ b/src/gui/kernel/qapplication.cpp
+@@ -5175,6 +5175,8 @@ QInputContext *QApplication::inputContex
+ {
+     Q_D(const QApplication);
+     Q_UNUSED(d);// only static members being used.
++    if (QApplicationPrivate::is_app_closing)
++        return d->inputContext;
+ #ifdef Q_WS_X11
+     if (!X11)
+         return 0;
+--- a/src/gui/kernel/qwidget_x11.cpp
++++ b/src/gui/kernel/qwidget_x11.cpp
+@@ -1097,7 +1097,7 @@ void QWidget::destroy(bool destroyWindow
+         } else {
+             // release previous focus information participating with
+             // preedit preservation of qic
+-            QInputContext *qic = inputContext();
++            QInputContext *qic = QApplicationPrivate::inputContext;
+             if (qic)
+                 qic->widgetDestroyed(this);
+         }
diff --git a/debian/patches/series b/debian/patches/series
index 94a0979..a4c04f5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -38,3 +38,5 @@
 93_jsvalue64_on_ia64.diff
 94_fix_crash_in_qdbuspendingreply_qdbusreply.diff
 95_sparc_platform_definition.diff
+96_powerpc_no_gc_sections.diff
+97_prevent_crash_on_inputcontext_creation.diff

-- 
Qt 4 Debian packaging