[SCM] qtbase packaging branch, ubuntu, updated. debian/5.5.1+dfsg-1-62-g0ef4d7d

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu branch:
commit 0ef4d7dcf718099e9a7ab26d8d66174166e8ea84
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Mon Nov 2 08:20:45 2015 +0000

    Remove disable_overlay_scrollbars.diff as overlay scrollbars were dropped.
---
 debian/changelog                               |  1 +
 debian/patches/disable_overlay_scrollbars.diff | 50 --------------------------
 debian/patches/series                          |  1 -
 3 files changed, 1 insertion(+), 51 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9d5afc9..1e3fd98 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ qtbase-opensource-src (5.5.1+dfsg-1ubuntu1) UNRELEASED; urgency=medium
       (LP: #1470700)
   * debian/patches/Use-Node-name-if-Node-logicalModuleName-is-empty-for.patch:
     - Fix a qdoc issue (LP: #1447182)
+  * Remove disable_overlay_scrollbars.diff as overlay scrollbars were dropped.
 
  -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Tue, 24 Mar 2015 13:56:14 +0000
 
diff --git a/debian/patches/disable_overlay_scrollbars.diff b/debian/patches/disable_overlay_scrollbars.diff
deleted file mode 100644
index 52e9194..0000000
--- a/debian/patches/disable_overlay_scrollbars.diff
+++ /dev/null
@@ -1,50 +0,0 @@
-Description: disable Ubuntu overlay scrollbars as they don’t play well with Qt
-Author: Aurélien Gâteau <aurelien.gateau at canonical.com>
-Last-Update: 2013-04-22
-Forwarded: not-needed
-
---- a/src/widgets/styles/qgtkstyle_p.cpp
-+++ b/src/widgets/styles/qgtkstyle_p.cpp
-@@ -99,6 +99,7 @@ Q_GLOBAL_STATIC(QGtkStyleUpdateScheduler, styleScheduler)
- 
- Ptr_gtk_container_forall QGtkStylePrivate::gtk_container_forall = 0;
- Ptr_gtk_init QGtkStylePrivate::gtk_init = 0;
-+Ptr_ubuntu_gtk_set_use_overlay_scrollbar QGtkStylePrivate::ubuntu_gtk_set_use_overlay_scrollbar = 0;
- Ptr_gtk_style_attach QGtkStylePrivate::gtk_style_attach = 0;
- Ptr_gtk_window_new QGtkStylePrivate::gtk_window_new = 0;
- Ptr_gtk_widget_destroy QGtkStylePrivate::gtk_widget_destroy = 0;
-@@ -351,6 +352,7 @@ void QGtkStylePrivate::resolveGtk() const
-     QLibrary libgtk(QLS("gtk-x11-2.0"), 0, 0);
- 
-     gtk_init = (Ptr_gtk_init)libgtk.resolve("gtk_init");
-+    ubuntu_gtk_set_use_overlay_scrollbar = (Ptr_ubuntu_gtk_set_use_overlay_scrollbar)libgtk.resolve("ubuntu_gtk_set_use_overlay_scrollbar");
-     gtk_window_new = (Ptr_gtk_window_new)libgtk.resolve("gtk_window_new");
-     gtk_style_attach = (Ptr_gtk_style_attach)libgtk.resolve("gtk_style_attach");
-     gtk_widget_destroy = (Ptr_gtk_widget_destroy)libgtk.resolve("gtk_widget_destroy");
-@@ -549,6 +551,8 @@ void QGtkStylePrivate::initGtkWidgets() const
-         QGtkStylePrivate::gtk_init (NULL, NULL);
- #ifndef Q_OS_MAC
-         XSetErrorHandler(qt_x_errhandler);
-+        if (QGtkStylePrivate::ubuntu_gtk_set_use_overlay_scrollbar)
-+            QGtkStylePrivate::ubuntu_gtk_set_use_overlay_scrollbar(false);
- #endif
- 
-         // make a window
---- a/src/widgets/styles/qgtkstyle_p_p.h
-+++ b/src/widgets/styles/qgtkstyle_p_p.h
-@@ -129,6 +129,7 @@ typedef char* (*Ptr_gconf_client_get_string)(GConfClient*, const char*, GError *
- typedef bool (*Ptr_gconf_client_get_bool)(GConfClient*, const char*, GError **);
- 
- typedef void (*Ptr_gtk_init)(int *, char ***);
-+typedef void (*Ptr_ubuntu_gtk_set_use_overlay_scrollbar) (gboolean);
- typedef GtkWidget* (*Ptr_gtk_window_new) (GtkWindowType);
- typedef GtkStyle* (*Ptr_gtk_style_attach)(GtkStyle *, GdkWindow *);
- typedef void (*Ptr_gtk_widget_destroy) (GtkWidget *);
-@@ -344,6 +345,7 @@ public:
- 
-     static Ptr_gtk_container_forall gtk_container_forall;
-     static Ptr_gtk_init gtk_init;
-+    static Ptr_ubuntu_gtk_set_use_overlay_scrollbar ubuntu_gtk_set_use_overlay_scrollbar;
-     static Ptr_gtk_style_attach gtk_style_attach;
-     static Ptr_gtk_window_new gtk_window_new;
-     static Ptr_gtk_widget_destroy gtk_widget_destroy;
diff --git a/debian/patches/series b/debian/patches/series
index f98009b..b544121 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,7 +12,6 @@ hurd-forkfd.diff
 link_fbclient.diff
 
 # Ubuntu specific.
-disable_overlay_scrollbars.diff
 qt5-qmake-arm-linux-gnueabihf
 Add-workaround-for-GL-on-Android-emulator.patch
 enable-tests.patch

-- 
qtbase packaging