← Back to branch summary

~unity-team/kubuntu-packaging/qtbase-5.2.2

« back to all changes in this revision

Viewing changes to debian/patches/disable_overlay_scrollbars.diff

  • Committer: Michał Sawicz
  • Date: 2014-02-28 00:44:03 UTC
  • Revision ID: michal.sawicz@canonical.com-20140228004403-0ahoj05pe5y98wm8
New upstream snapshot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/disable_overlay_scrollbars.diff
5
5
 
6
6
--- a/src/widgets/styles/qgtkstyle_p.cpp
7
7
+++ b/src/widgets/styles/qgtkstyle_p.cpp
8
 
@@ -99,6 +99,7 @@ Q_GLOBAL_STATIC(QGtkStyleUpdateScheduler, styleScheduler)
 
8
@@ -99,6 +99,7 @@
9
9
 
10
10
 Ptr_gtk_container_forall QGtkStylePrivate::gtk_container_forall = 0;
11
11
 Ptr_gtk_init QGtkStylePrivate::gtk_init = 0;
13
13
 Ptr_gtk_style_attach QGtkStylePrivate::gtk_style_attach = 0;
14
14
 Ptr_gtk_window_new QGtkStylePrivate::gtk_window_new = 0;
15
15
 Ptr_gtk_widget_destroy QGtkStylePrivate::gtk_widget_destroy = 0;
16
 
@@ -351,6 +352,7 @@ void QGtkStylePrivate::resolveGtk() const
 
16
@@ -351,6 +352,7 @@
17
17
     QLibrary libgtk(QLS("gtk-x11-2.0"), 0, 0);
18
18
 
19
19
     gtk_init = (Ptr_gtk_init)libgtk.resolve("gtk_init");
21
21
     gtk_window_new = (Ptr_gtk_window_new)libgtk.resolve("gtk_window_new");
22
22
     gtk_style_attach = (Ptr_gtk_style_attach)libgtk.resolve("gtk_style_attach");
23
23
     gtk_widget_destroy = (Ptr_gtk_widget_destroy)libgtk.resolve("gtk_widget_destroy");
24
 
@@ -549,6 +551,8 @@ void QGtkStylePrivate::initGtkWidgets() const
 
24
@@ -537,6 +539,8 @@
25
25
         QGtkStylePrivate::gtk_init (NULL, NULL);
26
26
 #ifndef Q_OS_MAC
27
27
         XSetErrorHandler(qt_x_errhandler);
32
32
         // make a window
33
33
--- a/src/widgets/styles/qgtkstyle_p_p.h
34
34
+++ b/src/widgets/styles/qgtkstyle_p_p.h
35
 
@@ -129,6 +129,7 @@ typedef char* (*Ptr_gconf_client_get_string)(GConfClient*, const char*, GError *
 
35
@@ -129,6 +129,7 @@
36
36
 typedef bool (*Ptr_gconf_client_get_bool)(GConfClient*, const char*, GError **);
37
37
 
38
38
 typedef void (*Ptr_gtk_init)(int *, char ***);
40
40
 typedef GtkWidget* (*Ptr_gtk_window_new) (GtkWindowType);
41
41
 typedef GtkStyle* (*Ptr_gtk_style_attach)(GtkStyle *, GdkWindow *);
42
42
 typedef void (*Ptr_gtk_widget_destroy) (GtkWidget *);
43
 
@@ -344,6 +345,7 @@ public:
 
43
@@ -344,6 +345,7 @@
44
44
 
45
45
     static Ptr_gtk_container_forall gtk_container_forall;
46
46
     static Ptr_gtk_init gtk_init;