Merging with trunk

(bzr r3788.6.17)

1 files changed, 4 insertions, 1 deletions

diff --git a/unity-shared/CMakeLists.txt b/unity-shared/CMakeLists.txt
index da70990b1..3577992a6 100644
--- a/unity-shared/CMakeLists.txt
+++ b/unity-shared/CMakeLists.txt
@@ -18,6 +18,7 @@ include_directories (.. ../services ../UnityCore ${UNITY_SRC} ${CMAKE_BINARY_DIR
 #
 set (UNITY_SHARED_SOURCES
 ApplicationManager.cpp
+ AppStreamApplication.cpp
 BGHash.cpp
 CoverArt.cpp
 BackgroundEffectHelper.cpp
@@ -28,6 +29,7 @@ set (UNITY_SHARED_SOURCES
 DeltaRestrainment.cpp
 DesktopApplicationManager.cpp
 EMConverter.cpp
+ ExpanderView.cpp
 GnomeFileManager.cpp
 FontSettings.cpp
 GraphicsUtils.cpp
@@ -44,6 +46,7 @@ set (UNITY_SHARED_SOURCES
 LineSeparator.cpp
 MenuManager.cpp
 OverlayRenderer.cpp
+ OverlayScrollView.cpp
 OverlayWindowButtons.cpp
 PanelStyle.cpp
 PlacesVScrollBar.cpp
@@ -59,6 +62,7 @@ set (UNITY_SHARED_SOURCES
 TextureCache.cpp
 TextInput.cpp
 TextureThumbnailProvider.cpp
+ ThemeSettings.cpp
 ThumbnailGenerator.cpp
 Timer.cpp
 UBusServer.cpp
@@ -69,7 +73,6 @@ set (UNITY_SHARED_SOURCES
 UnityWindowView.cpp
 UpstartWrapper.cpp
 UserThumbnailProvider.cpp
- VScrollBarOverlayWindow.cpp
 WindowButtons.cpp
 WindowManager.cpp
 )