Compiz

Merge lp:~townsend/compiz/fix-lp1288953 into lp:compiz/0.9.11

  1. fix-lp1288953
  2. Merge into 0.9.11
Proposed by Christopher Townsend
Status: Merged
Approved by: Christopher Townsend
Approved revision: 3850
Merged at revision: 3853
Proposed branch: lp:~townsend/compiz/fix-lp1288953
Merge into: lp:compiz/0.9.11
Diff against target: 53 lines (+7/-0)
3 files modified
kde/window-decorator-kde4/kdecorationbridge.h (+3/-0)
kde/window-decorator-kde4/window.cpp (+2/-0)
kde/window-decorator-kde4/window.h (+2/-0)
To merge this branch: bzr merge lp:~townsend/compiz/fix-lp1288953
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Eleni Maria Stea Approve
Marco Trevisan (Treviño) Approve
Review via email: mp+214750@code.launchpad.net

Commit message

Add support to build kde4-window-decorator for KDE 4.10 and older.

Description of the change

Add support to build kde4-window-decorator for KDE 4.10 and older.

To post a comment you must log in.
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) :
review: Approve
Revision history for this message
Eleni Maria Stea (hikiko) wrote :

lgtm :)

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:3850
http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-ci/57/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-amd64-ci/57
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-armhf-ci/57
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-i386-ci/57

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/compiz-0.9.11-ci/57/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'kde/window-decorator-kde4/kdecorationbridge.h'
2--- kde/window-decorator-kde4/kdecorationbridge.h 2013-06-25 07:08:45 +0000
3+++ kde/window-decorator-kde4/kdecorationbridge.h 2014-04-08 13:11:35 +0000
4@@ -26,6 +26,7 @@
5 #define KDECORATIONBRIDGE_H
6
7 #include "kdecoration.h"
8+#include "kdeversion.h"
9 #include <QWidget>
10
11 /**
12@@ -42,7 +43,9 @@
13 virtual bool isCloseable() const = 0;
14 virtual bool isMaximizable() const = 0;
15 virtual MaximizeMode maximizeMode() const = 0;
16+#if KDE_IS_VERSION(4,10,90)
17 virtual QuickTileMode quickTileMode() const = 0;
18+#endif
19 virtual bool isMinimizable() const = 0;
20 virtual bool providesContextHelp() const = 0;
21 virtual int desktop() const = 0;
22
23=== modified file 'kde/window-decorator-kde4/window.cpp'
24--- kde/window-decorator-kde4/window.cpp 2013-06-23 09:03:37 +0000
25+++ kde/window-decorator-kde4/window.cpp 2014-04-08 13:11:35 +0000
26@@ -226,11 +226,13 @@
27 return wInfo.actionSupported (NET::ActionMax);
28 }
29
30+#if KDE_IS_VERSION(4,10,90)
31 KDecoration::QuickTileMode
32 KWD::Window::quickTileMode (void) const
33 {
34 return QuickTileNone;
35 }
36+#endif
37
38 KDecoration::MaximizeMode
39 KWD::Window::maximizeMode (void) const
40
41=== modified file 'kde/window-decorator-kde4/window.h'
42--- kde/window-decorator-kde4/window.h 2013-06-23 09:48:28 +0000
43+++ kde/window-decorator-kde4/window.h 2014-04-08 13:11:35 +0000
44@@ -71,7 +71,9 @@
45 virtual bool isCloseable (void) const;
46 virtual bool isMaximizable (void) const;
47 virtual MaximizeMode maximizeMode (void) const;
48+#if KDE_IS_VERSION(4,10,90)
49 virtual QuickTileMode quickTileMode (void) const;
50+#endif
51 virtual bool isMinimizable (void) const;
52 virtual bool providesContextHelp (void) const;
53 virtual int desktop (void) const;

Subscribers

People subscribed via source and target branches