Compile with Qt 5.5 Fixes: #1437238
Approved by: Timo Jyrinki
commit551a103babb2366552afc9ab2ed2b4a79a2a441a
authorAlbert Astals Cid <albert.astals@canonical.com>
dateWed 22 Apr 2015, 14:45 (11 years ago)
parent26ca850d7e6d83
plugins/Greeter/Unity/Launcher/CMakeLists.txt+1
@@ -18,6 +18,7 @@ set(QMLLAUNCHERPLUGINAS_SRC
1818 quicklistmodel.cpp
1919 quicklistentry.cpp
2020 ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp
21+ ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h
2122 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h
2223 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h
2324 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/QuickListModelInterface.h
plugins/Unity/Launcher/CMakeLists.txt+1
@@ -22,6 +22,7 @@ set(QMLLAUNCHERPLUGIN_SRC
2222 desktopfilehandler.cpp
2323 asadapter.cpp
2424 ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp
25+ ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h
2526 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h
2627 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h
2728 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/QuickListModelInterface.h
tests/mocks/Unity/Launcher/CMakeLists.txt+1
@@ -5,6 +5,7 @@ include_directories(
55)
66
77set(MockLauncherModel_SOURCES
8+ ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h
89 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h
910 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h
1011 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/QuickListModelInterface.h
tests/mocks/libusermetrics/ColorTheme.h+2−1
@@ -19,7 +19,8 @@
1919#ifndef UNITY_MOCK_COLORTHEME_H
2020#define UNITY_MOCK_COLORTHEME_H
2121
22−#include <QtGui/QColor>
22+#include <QObject>
23+#include <QColor>
2324
2425namespace UserMetricsOutput
2526{