Unity 8

Merge lp:~aacid/unity8/floor_includes into lp:unity8

  1. floor_includes
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Merged
Approved by: Lukáš Tinkl
Approved revision: 2547
Merged at revision: 2548
Proposed branch: lp:~aacid/unity8/floor_includes
Merge into: lp:unity8
Diff against target: 39 lines (+6/-2)
2 files modified
plugins/Dash/organicgrid.cpp (+3/-1)
plugins/Dash/verticaljournal.cpp (+3/-1)
To merge this branch: bzr merge lp:~aacid/unity8/floor_includes
Reviewer Review Type Date Requested Status
Timo Jyrinki Approve
Lukáš Tinkl (community) Approve
Review via email: mp+300850@code.launchpad.net

Commit message

Add math.h includes for compilation in yakkety

Description of the change

 * Are there any related MPs required for this MP to build/function as expected?
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
N/A

To post a comment you must log in.
Revision history for this message
Lukáš Tinkl (lukas-kde) wrote :

LGTM

review: Approve
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

Fixes the issue!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/Dash/organicgrid.cpp'
2--- plugins/Dash/organicgrid.cpp 2016-06-02 09:32:33 +0000
3+++ plugins/Dash/organicgrid.cpp 2016-07-22 08:37:17 +0000
4@@ -1,5 +1,5 @@
5 /*
6- * Copyright (C) 2014 Canonical, Ltd.
7+ * Copyright (C) 2014, 2016 Canonical, Ltd.
8 *
9 * This program is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License as published by
11@@ -16,6 +16,8 @@
12
13 #include "organicgrid.h"
14
15+#include <math.h>
16+
17 #include <private/qquickitem_p.h>
18
19 OrganicGrid::OrganicGrid()
20
21=== modified file 'plugins/Dash/verticaljournal.cpp'
22--- plugins/Dash/verticaljournal.cpp 2016-06-02 09:32:33 +0000
23+++ plugins/Dash/verticaljournal.cpp 2016-07-22 08:37:17 +0000
24@@ -1,5 +1,5 @@
25 /*
26- * Copyright (C) 2013 Canonical, Ltd.
27+ * Copyright (C) 2013, 2016 Canonical, Ltd.
28 *
29 * This program is free software; you can redistribute it and/or modify
30 * it under the terms of the GNU General Public License as published by
31@@ -27,6 +27,8 @@
32 */
33 #include "verticaljournal.h"
34
35+#include <math.h>
36+
37 #include <private/qquickitem_p.h>
38
39 VerticalJournal::VerticalJournal()

Subscribers

People subscribed via source and target branches