← Back to branch summary

~mterry/unity8/greeter-misc-cleanups

~mterry/unity8/greeter-misc-cleanups

« back to all changes in this revision

Viewing changes to src/CMakeLists.txt

Committer: Michael Terry
Date: 2014-08-07 15:30:54 UTC
mfrom: (1086.1.48 unity8)
Revision ID: michael.terry@canonical.com-20140807153054-nqahwmptl0dw9bum

Merge from trunk

files added:
data/unity8-dash.conf

data/unity8-dash.desktop.in

plugins/Unity/DashCommunicator

plugins/Unity/DashCommunicator/CMakeLists.txt

plugins/Unity/DashCommunicator/dashcommunicator.cpp

plugins/Unity/DashCommunicator/dashcommunicator.h

plugins/Unity/DashCommunicator/dashcommunicatorservice.cpp

plugins/Unity/DashCommunicator/dashcommunicatorservice.h

plugins/Unity/DashCommunicator/dbusdashcommunicatorservice.cpp

plugins/Unity/DashCommunicator/dbusdashcommunicatorservice.h

plugins/Unity/DashCommunicator/plugin.cpp

plugins/Unity/DashCommunicator/plugin.h

plugins/Unity/DashCommunicator/qmldir

qml/Components/graphics/pagination_dot_off@30.png

qml/Components/graphics/pagination_dot_on@30.png

qml/Dash/DashApplication.qml

qml/Dash/Previews/PreviewExpandable.qml

qml/Dash/graphics/phone/screenshots/unity8-dash@12.png

qml/Panel/Indicators/ModemInfoItem.qml

qml/Panel/Indicators/RoamingIndication.qml

src/Dash

src/Dash/CMakeLists.txt

src/Dash/main.cpp

tests/autopilot/unity8/fixture_setup.py

tests/mocks/Unity/DashCommunicator

tests/mocks/Unity/DashCommunicator/CMakeLists.txt

tests/mocks/Unity/DashCommunicator/dashcommunicator.cpp

tests/mocks/Unity/DashCommunicator/dashcommunicator.h

tests/mocks/Unity/DashCommunicator/dashcommunicatorservice.cpp

tests/mocks/Unity/DashCommunicator/dashcommunicatorservice.h

tests/mocks/Unity/DashCommunicator/plugin.cpp

tests/mocks/Unity/DashCommunicator/plugin.h

tests/mocks/Unity/DashCommunicator/qmldir

tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml

files removed:
qml/Components/SeeMore.qml

tests/qmltests/Components/tst_SeeMore.qml

files renamed:
qml/Dash/DashDepartments.qml => qml/Dash/DashNavigation.qml

qml/Dash/DashDepartmentsList.qml => qml/Dash/DashNavigationList.qml

tests/mocks/Unity/fake_department.cpp => tests/mocks/Unity/fake_navigation.cpp

tests/mocks/Unity/fake_department.h => tests/mocks/Unity/fake_navigation.h

files modified:
CMakeLists.txt

cmake/modules/QmlTest.cmake

data/CMakeLists.txt

data/unity8.conf

debian/changelog

debian/control

debian/unity8.install

plugins/Dash/CardCreator.js

plugins/Dash/ScopeStyle.qml

plugins/Unity/CMakeLists.txt

plugins/Unity/Launcher/launchermodel.cpp

po/am.po

po/el.po

po/es.po

po/eu.po

po/hu.po

po/ja.po

po/pt_BR.po

po/sl.po

qml/Components/EdgeDemo.qml

qml/Components/PageHeader.qml

qml/Dash/CardTool.qml

qml/Dash/Dash.qml

qml/Dash/DashContent.qml

qml/Dash/GenericScopeView.qml

qml/Dash/PreviewListView.qml

qml/Dash/Previews/PreviewImageGallery.qml

qml/Dash/Previews/PreviewTextSummary.qml

qml/Dash/Previews/PreviewWidget.qml

qml/Dash/Previews/PreviewWidgetFactory.qml

qml/Dash/ScopeListView.qml

qml/Greeter/Greeter.qml

qml/Launcher/Launcher.qml

qml/Notifications/NotificationMenuItemFactory.qml

qml/Panel/Indicators/MenuItemFactory.qml

qml/ScopeTool.qml

qml/Shell.qml

qml/Stages/PhoneStage.qml

qml/Stages/SpreadDelegate.qml

qml/Stages/TabletStage.qml

qml/Stages/TransformedSpreadDelegate.qml

qml/Stages/TransformedTabletSpreadDelegate.qml

run_on_device.sh

src/CMakeLists.txt

tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py

tests/autopilot/unity8/application_lifecycle/tests/test_url_dispatcher.py

tests/autopilot/unity8/process_helpers.py

tests/autopilot/unity8/shell/emulators/dash.py

tests/autopilot/unity8/shell/emulators/greeter.py

tests/autopilot/unity8/shell/emulators/main_window.py

tests/autopilot/unity8/shell/tests/__init__.py

tests/autopilot/unity8/shell/tests/test_emulators.py

tests/autopilot/unity8/shell/tests/test_lock_screen.py

tests/autopilot/unity8/shell/tests/test_notifications.py

tests/autopilot/unity8/shell/tests/test_upstart.py

tests/mocks/Unity/Application/ApplicationInfo.cpp

tests/mocks/Unity/Application/ApplicationInfo.h

tests/mocks/Unity/Application/ApplicationManager.cpp

tests/mocks/Unity/Application/ApplicationManager.h

tests/mocks/Unity/Application/ApplicationScreenshotProvider.cpp

tests/mocks/Unity/CMakeLists.txt

tests/mocks/Unity/Unity.qmltypes

tests/mocks/Unity/fake_scope.cpp

tests/mocks/Unity/fake_scope.h

tests/mocks/Unity/fake_scopes.cpp

tests/mocks/Unity/fake_scopes.h

tests/mocks/Unity/fake_unity_plugin.cpp

tests/plugins/Dash/cardcreator/1.res

tests/plugins/Dash/cardcreator/1.tst

tests/plugins/Dash/cardcreator/2.res

tests/plugins/Dash/cardcreator/2.tst

tests/plugins/Dash/cardcreator/3.res

tests/plugins/Dash/cardcreator/3.tst

tests/plugins/Dash/cardcreator/4.res

tests/plugins/Dash/cardcreator/4.tst

tests/plugins/Dash/cardcreator/5.res

tests/plugins/Dash/cardcreator/5.tst

tests/plugins/Dash/cardcreator/6.res

tests/plugins/Dash/cardcreator/6.tst

tests/plugins/Dash/cardcreator/7.res

tests/plugins/Dash/cardcreator/7.tst

tests/plugins/Dash/cardcreatortest.cpp

tests/plugins/Dash/tst_ScopeStyle.qml

tests/qmltests/CMakeLists.txt

tests/qmltests/Components/tst_PageHeader.qml

tests/qmltests/Dash/CardHelpers.js

tests/qmltests/Dash/Previews/tst_PreviewTextSummary.qml

tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml

tests/qmltests/Dash/tst_Card.qml

tests/qmltests/Dash/tst_Dash.qml

tests/qmltests/Dash/tst_DashContent.qml

tests/qmltests/Dash/tst_GenericScopeView.qml

tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml

tests/qmltests/Stages/tst_PhoneStage.qml

tests/qmltests/tst_Shell.qml

tests/qmltests/tst_ShellWithPin.qml

Show diffs side-by-side

added added

removed removed

src/CMakeLists.txt

35

35

)

36

36

37

37

add_subdirectory(Panel)

38

add_subdirectory(Dash)

Older »