diff options
| author | Fathi Boudra <fabo@debian.org> | 2009-02-20 20:24:25 +0000 |
|---|---|---|
| committer | Fathi Boudra <fabo@debian.org> | 2009-02-20 20:24:25 +0000 |
| commit | 7b37d1bc4f6b27188b0688dcdc2b89db3101575c (patch) | |
| tree | dccc02bc71441fbb202d0bfd622af264fc33c89f /debian/patches/0195-compositing-properties.diff | |
| parent | 6ad728b38295ae6479662a58b8c640f389bfa607 (diff) | |
| download | qt4-x11-debian/4.5.0-rc1-1.tar.gz | |
Merge Qt4 4.5 branch to trunk.debian/4.5.0-rc1-1
Diffstat (limited to 'debian/patches/0195-compositing-properties.diff')
| -rw-r--r-- | debian/patches/0195-compositing-properties.diff | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/debian/patches/0195-compositing-properties.diff b/debian/patches/0195-compositing-properties.diff index 1e5b453..fc7814e 100644 --- a/debian/patches/0195-compositing-properties.diff +++ b/debian/patches/0195-compositing-properties.diff @@ -9,7 +9,7 @@ so they can be used when compositing. --- a/src/gui/kernel/qwidget_x11.cpp +++ b/src/gui/kernel/qwidget_x11.cpp -@@ -662,6 +662,11 @@ +@@ -702,6 +702,11 @@ void QWidgetPrivate::create_sys(WId wind Q_ASSERT(id); XChangeWindowAttributes(dpy, id, CWOverrideRedirect | CWSaveUnder, &wsa); @@ -21,7 +21,7 @@ so they can be used when compositing. } else if (topLevel && !desktop) { // top-level widget if (!X11->wm_client_leader) create_wm_client_leader(); -@@ -710,13 +715,21 @@ +@@ -752,13 +757,21 @@ void QWidgetPrivate::create_sys(WId wind // set EWMH window types setNetWmWindowTypes(); @@ -45,7 +45,7 @@ so they can be used when compositing. // declare the widget's window role QByteArray windowRole; -@@ -736,10 +749,6 @@ +@@ -778,10 +791,6 @@ void QWidgetPrivate::create_sys(WId wind XChangeProperty(dpy, id, ATOM(WM_CLIENT_LEADER), XA_WINDOW, 32, PropModeReplace, (unsigned char *)&X11->wm_client_leader, 1); |