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

Proposed by Albert Astals Cid on 2015-03-27
Status: Merged
Approved by: MichaƂ Sawicz on 2015-04-13
Approved revision: 1700
Merged at revision: 1734
Proposed branch: lp:~aacid/unity8/qt55
Merge into: lp:unity8
Diff against target: 49 lines (+5/-1)
4 files modified
plugins/Greeter/Unity/Launcher/CMakeLists.txt (+1/-0)
plugins/Unity/Launcher/CMakeLists.txt (+1/-0)
tests/mocks/Unity/Launcher/CMakeLists.txt (+1/-0)
tests/mocks/libusermetrics/ColorTheme.h (+2/-1)
To merge this branch: bzr merge lp:~aacid/unity8/qt55
Reviewer Review Type Date Requested Status
Timo Jyrinki 2015-03-27 Approve on 2015-04-08
PS Jenkins bot (community) continuous-integration Needs Fixing on 2015-04-02
Review via email: mp+254418@code.launchpad.net

Commit message

Compile with Qt 5.5

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?
No, compile only change

 * Did you make sure that your branch does not contain spurious tags?
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.
Daniel d'Andrada (dandrader) wrote :

"""
+#include <QtCore/QObject>
"""

We are not doing #includes like that anymore, it should be just <QObject>. So go ahead and fix the "#include <QtGui/QColor>" below as well.

Albert Astals Cid (aacid) wrote :

style fixed

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/Greeter/Unity/Launcher/CMakeLists.txt'
2--- plugins/Greeter/Unity/Launcher/CMakeLists.txt 2015-02-11 13:43:17 +0000
3+++ plugins/Greeter/Unity/Launcher/CMakeLists.txt 2015-04-13 09:34:13 +0000
4@@ -19,6 +19,7 @@
5 quicklistmodel.cpp
6 quicklistentry.cpp
7 ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp
8+ ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h
9 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h
10 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h
11 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/QuickListModelInterface.h
12
13=== modified file 'plugins/Unity/Launcher/CMakeLists.txt'
14--- plugins/Unity/Launcher/CMakeLists.txt 2015-02-11 14:02:16 +0000
15+++ plugins/Unity/Launcher/CMakeLists.txt 2015-04-13 09:34:13 +0000
16@@ -22,6 +22,7 @@
17 desktopfilehandler.cpp
18 asadapter.cpp
19 ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp
20+ ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h
21 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h
22 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h
23 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/QuickListModelInterface.h
24
25=== modified file 'tests/mocks/Unity/Launcher/CMakeLists.txt'
26--- tests/mocks/Unity/Launcher/CMakeLists.txt 2015-02-11 13:43:17 +0000
27+++ tests/mocks/Unity/Launcher/CMakeLists.txt 2015-04-13 09:34:13 +0000
28@@ -5,6 +5,7 @@
29 )
30
31 set(MockLauncherModel_SOURCES
32+ ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h
33 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h
34 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h
35 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/QuickListModelInterface.h
36
37=== modified file 'tests/mocks/libusermetrics/ColorTheme.h'
38--- tests/mocks/libusermetrics/ColorTheme.h 2013-06-14 19:35:25 +0000
39+++ tests/mocks/libusermetrics/ColorTheme.h 2015-04-13 09:34:13 +0000
40@@ -19,7 +19,8 @@
41 #ifndef UNITY_MOCK_COLORTHEME_H
42 #define UNITY_MOCK_COLORTHEME_H
43
44-#include <QtGui/QColor>
45+#include <QObject>
46+#include <QColor>
47
48 namespace UserMetricsOutput
49 {

Subscribers

People subscribed via source and target branches