cbab3c2 · unity8 · git.iko.soy

CMakeLists.txt+1

compare with xenial

unifiedsplit

@@ -113,6 +113,7 @@ set(MOCK_INDICATOR_SERVICE_APP unity-mock-indicator-service)

113include_directories(

114 ${CMAKE_SOURCE_DIR}/include

115 ${CMAKE_BINARY_DIR}/include

116+ ${APPLICATION_API_INCLUDE_DIRS}

116)

117)

117

118

118# add subdirectories to build

119# 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−

5set(FakeUnityApplicationQml_SOURCES

1set(FakeUnityApplicationQml_SOURCES

6 plugin.cpp

2 plugin.cpp

7 ApplicationInfo.cpp

3 ApplicationInfo.cpp

tests/mocks/Utils/CMakeLists.txt+1

@@ -16,6 +16,7 @@ set(QMLPLUGIN_SRC

16 ${CMAKE_SOURCE_DIR}/plugins/Utils/timeformatter.cpp

17 ${CMAKE_SOURCE_DIR}/plugins/Utils/unitymenumodelpaths.cpp

18 ${CMAKE_SOURCE_DIR}/plugins/Utils/windowkeysfilter.cpp

19+ ${CMAKE_SOURCE_DIR}/plugins/Utils/windowscreenshotprovider.cpp

19 ${CMAKE_SOURCE_DIR}/plugins/Utils/easingcurve.cpp

20 ${CMAKE_SOURCE_DIR}/plugins/Utils/easingcurve.cpp

20 constants.cpp

21 constants.cpp

21 plugin.cpp

22 plugin.cpp

tests/mocks/Utils/plugin.cpp+3

@@ -34,6 +34,7 @@

34#include <timeformatter.h>

35#include <unitymenumodelpaths.h>

36#include <windowkeysfilter.h>

37+#include <windowscreenshotprovider.h>

37#include <easingcurve.h>

38#include <easingcurve.h>

38

39

39static QObject *createWindowStateStorage(QQmlEngine *engine, QJSEngine *scriptEngine)

40static QObject *createWindowStateStorage(QQmlEngine *engine, QJSEngine *scriptEngine)

@@ -70,4 +71,6 @@ void FakeUtilsPlugin::registerTypes(const char *uri)

70void FakeUtilsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)

71void FakeUtilsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)

71{

72{

72 QQmlExtensionPlugin::initializeEngine(engine, uri);

73 QQmlExtensionPlugin::initializeEngine(engine, uri);

74+

75+ engine->addImageProvider(QLatin1String("window"), new WindowScreenshotProvider);

73}

76}

tests/plugins/Unity/Launcher/CMakeLists.txt−1

@@ -2,7 +2,6 @@ pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)

2pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=6)

3

4include_directories(

5− ${APPLICATION_API_INCLUDE_DIRS}

6 ${CMAKE_CURRENT_SOURCE_DIR}

5 ${CMAKE_CURRENT_SOURCE_DIR}

7 ${CMAKE_CURRENT_BINARY_DIR}

6 ${CMAKE_CURRENT_BINARY_DIR}

8 ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher

7 ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher