[SCM] Qt 4 packaging branch, master, updated. debian/4.6.3-1-5-g2a0147f

[Fathi Boudra]

The following commit has been merged in the master branch:
commit ce886173899c853b5ddc32f597850fb5a257dc4e
Author: Fathi Boudra <fabo at debian.org>
Date:   Wed Jul 14 09:38:54 2010 +0300

    Drop 0006_device_context_leak.diff - Windows only
---
 debian/changelog                             |    3 +--
 debian/patches/0006_device_context_leak.diff |   12 ------------
 debian/patches/series                        |    1 -
 3 files changed, 1 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4034d71..89f4285 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,11 +2,10 @@ qt4-x11 (4:4.6.3-2) UNRELEASED; urgency=low
 
   * Add upstream patch:
     - 0005_fix_detection_of_headers_files.diff
-      Disable the include generation iff a dot which is not followed by [hH]
+      Disable the include generation if a dot which is not followed by [hH]
       is found after the last path separator. This implies that dots in
       directory names are now ignored, and that files without an extension are
       always considered headers (e.g., STL headers and Qt forwarding headers).
-    - 0006_device_context_leak.diff
 
  -- Fathi Boudra <fabo at debian.org>  Thu, 17 Jun 2010 09:03:32 +0300
 
diff --git a/debian/patches/0006_device_context_leak.diff b/debian/patches/0006_device_context_leak.diff
deleted file mode 100644
index e477d0c..0000000
--- a/debian/patches/0006_device_context_leak.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/gui/kernel/qapplication_win.cpp
-+++ b/src/gui/kernel/qapplication_win.cpp
-@@ -933,6 +933,9 @@ const QString qt_reg_winclass(QWidget *w
-     if (qt_widget_private(w)->isGLWidget) {
-         cname = QLatin1String("QGLWidget");
-         style = CS_DBLCLKS;
-+#ifndef Q_WS_WINCE
-+        style |= CS_OWNDC;
-+#endif
-         icon  = true;
-     } else if (flags & Qt::MSWindowsOwnDC) {
-         cname = QLatin1String("QWidgetOwnDC");
diff --git a/debian/patches/series b/debian/patches/series
index f5cd9e6..953b713 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,6 @@
 # upstream patches
 0004_problem_displaying_half_width_character.diff
 0005_fix_detection_of_headers_files.diff
-0006_device_context_leak.diff
 
 # qt-copy patches
 0180-window-role.diff

-- 
Qt 4 packaging