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

[Albert Astals Cid]

Compile with Qt 5.5

 * 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

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1698
http://jenkins.qa.ubuntu.com/job/unity8-ci/5494/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2022
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/658
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/659
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/659
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1783
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2020
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2020/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19254

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5494/rebuild

review: Needs Fixing (continuous-integration)

[Daniel d'Andrada (dandrader)]

"""
+#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)]

style fixed

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1699
http://jenkins.qa.ubuntu.com/job/unity8-ci/5513/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2096
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/676
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/678
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/678
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1846
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2094
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2094/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19378

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5513/rebuild

review: Needs Fixing (continuous-integration)

[Timo Jyrinki (timo-jyrinki)]

Success https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/landing-020/+sourcepub/4931231/+listing-archive-extra

review: Approve

=== modified file 'plugins/Greeter/Unity/Launcher/CMakeLists.txt'
--- plugins/Greeter/Unity/Launcher/CMakeLists.txt	2015-02-11 13:43:17 +0000
+++ plugins/Greeter/Unity/Launcher/CMakeLists.txt	2015-04-13 09:34:13 +0000
@@ -19,6 +19,7 @@
     quicklistmodel.cpp
     quicklistentry.cpp
     ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp
+    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h
     ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h
     ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h
     ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/QuickListModelInterface.h

=== modified file 'plugins/Unity/Launcher/CMakeLists.txt'
--- plugins/Unity/Launcher/CMakeLists.txt	2015-02-11 14:02:16 +0000
+++ plugins/Unity/Launcher/CMakeLists.txt	2015-04-13 09:34:13 +0000
@@ -22,6 +22,7 @@
     desktopfilehandler.cpp
     asadapter.cpp
     ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp
+    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h
     ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h
     ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h
     ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/QuickListModelInterface.h

=== modified file 'tests/mocks/Unity/Launcher/CMakeLists.txt'
--- tests/mocks/Unity/Launcher/CMakeLists.txt	2015-02-11 13:43:17 +0000
+++ tests/mocks/Unity/Launcher/CMakeLists.txt	2015-04-13 09:34:13 +0000
@@ -5,6 +5,7 @@
 )
 
 set(MockLauncherModel_SOURCES
+    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h
     ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h
     ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h
     ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/QuickListModelInterface.h

=== modified file 'tests/mocks/libusermetrics/ColorTheme.h'
--- tests/mocks/libusermetrics/ColorTheme.h	2013-06-14 19:35:25 +0000
+++ tests/mocks/libusermetrics/ColorTheme.h	2015-04-13 09:34:13 +0000
@@ -19,7 +19,8 @@
 #ifndef UNITY_MOCK_COLORTHEME_H
 #define UNITY_MOCK_COLORTHEME_H
 
-#include <QtGui/QColor>
+#include <QObject>
+#include <QColor>
 
 namespace UserMetricsOutput
 {