git.iko.soy/unity8
on xenial help sign in
Fix build regarding unity-api and add screenshot provider to the mock Utils plugin
commitcbab3c22e1cb196b524defc0d6719394e4f59c0c authorDaniel d'Andrada <daniel.dandrada@canonical.com> dateThu 21 May 2015, 12:27 (11 years ago) parent79c9074
5 files changed+5−5
compare with xenial
unifiedsplit
CMakeLists.txt+1 tests/mocks/Unity/Application/CMakeLists.txt−4 tests/mocks/Utils/CMakeLists.txt+1 tests/mocks/Utils/plugin.cpp+3 tests/plugins/Unity/Launcher/CMakeLists.txt−1
CMakeLists.txt+1
@@ -113,6 +113,7 @@ set(MOCK_INDICATOR_SERVICE_APP unity-mock-indicator-service)
113113include_directories(
114114 ${CMAKE_SOURCE_DIR}/include
115115 ${CMAKE_BINARY_DIR}/include
116+ ${APPLICATION_API_INCLUDE_DIRS}
116117)
117118
118119# add subdirectories to build
tests/mocks/Unity/Application/CMakeLists.txt−4
@@ -1,7 +1,3 @@
1−include_directories(
2− ${APPLICATION_API_INCLUDE_DIRS}
3−)
4−
51set(FakeUnityApplicationQml_SOURCES
62 plugin.cpp
73 ApplicationInfo.cpp
tests/mocks/Utils/CMakeLists.txt+1
@@ -16,6 +16,7 @@ set(QMLPLUGIN_SRC
1616 ${CMAKE_SOURCE_DIR}/plugins/Utils/timeformatter.cpp
1717 ${CMAKE_SOURCE_DIR}/plugins/Utils/unitymenumodelpaths.cpp
1818 ${CMAKE_SOURCE_DIR}/plugins/Utils/windowkeysfilter.cpp
19+ ${CMAKE_SOURCE_DIR}/plugins/Utils/windowscreenshotprovider.cpp
1920 ${CMAKE_SOURCE_DIR}/plugins/Utils/easingcurve.cpp
2021 constants.cpp
2122 plugin.cpp
tests/mocks/Utils/plugin.cpp+3
@@ -34,6 +34,7 @@
3434#include <timeformatter.h>
3535#include <unitymenumodelpaths.h>
3636#include <windowkeysfilter.h>
37+#include <windowscreenshotprovider.h>
3738#include <easingcurve.h>
3839
3940static QObject *createWindowStateStorage(QQmlEngine *engine, QJSEngine *scriptEngine)
@@ -70,4 +71,6 @@ void FakeUtilsPlugin::registerTypes(const char *uri)
7071void FakeUtilsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
7172{
7273 QQmlExtensionPlugin::initializeEngine(engine, uri);
74+
75+ engine->addImageProvider(QLatin1String("window"), new WindowScreenshotProvider);
7376}
tests/plugins/Unity/Launcher/CMakeLists.txt−1
@@ -2,7 +2,6 @@ pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
22pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=6)
33
44include_directories(
5− ${APPLICATION_API_INCLUDE_DIRS}
65 ${CMAKE_CURRENT_SOURCE_DIR}
76 ${CMAKE_CURRENT_BINARY_DIR}
87 ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher