git.iko.soy/unity8
on xenial help sign in
Compile with Qt 5.5 Fixes: #1437238
551a103Albert Astals Cid
plugins/Greeter/Unity/Launcher/CMakeLists.txt+1
compare with xenial
unifiedsplit
@@ -18,6 +18,7 @@ set(QMLLAUNCHERPLUGINAS_SRC
18 quicklistmodel.cpp
18 quicklistmodel.cpp
19 quicklistentry.cpp
19 quicklistentry.cpp
20 ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp
20 ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp
21+ ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h
21 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h
22 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h
22 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h
23 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h
23 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/QuickListModelInterface.h
24 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/QuickListModelInterface.h
plugins/Unity/Launcher/CMakeLists.txt+1
@@ -22,6 +22,7 @@ set(QMLLAUNCHERPLUGIN_SRC
22 desktopfilehandler.cpp
22 desktopfilehandler.cpp
23 asadapter.cpp
23 asadapter.cpp
24 ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp
24 ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp
25+ ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h
25 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h
26 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h
26 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h
27 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h
27 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/QuickListModelInterface.h
28 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/QuickListModelInterface.h
tests/mocks/Unity/Launcher/CMakeLists.txt+1
@@ -5,6 +5,7 @@ include_directories(
5)
5)
6
6
7set(MockLauncherModel_SOURCES
7set(MockLauncherModel_SOURCES
8+ ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h
8 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h
9 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h
9 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h
10 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h
10 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/QuickListModelInterface.h
11 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/QuickListModelInterface.h
tests/mocks/libusermetrics/ColorTheme.h+2−1
@@ -19,7 +19,8 @@
19#ifndef UNITY_MOCK_COLORTHEME_H
19#ifndef UNITY_MOCK_COLORTHEME_H
20#define UNITY_MOCK_COLORTHEME_H
20#define UNITY_MOCK_COLORTHEME_H
21
21
22−#include <QtGui/QColor>
22+#include <QObject>
23+#include <QColor>
23
24
24namespace UserMetricsOutput
25namespace UserMetricsOutput
25{
26{