← Back to branch summary

~unity-team/unity8/slim-greeter

~unity-team/unity8/slim-greeter

« back to all changes in this revision

Viewing changes to plugins/Greeter/Unity/Launcher/qmldir

Committer: Michael Terry
Date: 2015-02-12 15:45:21 UTC
mfrom: (1432.1.178 unity8)
Revision ID: michael.terry@canonical.com-20150212154521-1qpg3t501ljj88lj

Merge from trunk

files added:
plugins/Greeter

plugins/Greeter/CMakeLists.txt

plugins/Greeter/Unity

plugins/Greeter/Unity/CMakeLists.txt

plugins/Greeter/Unity/Launcher

plugins/Greeter/Unity/Launcher/CMakeLists.txt

plugins/Greeter/Unity/Launcher/Launcher.qmltypes

plugins/Greeter/Unity/Launcher/launcheritem.cpp

plugins/Greeter/Unity/Launcher/launcheritem.h

plugins/Greeter/Unity/Launcher/launchermodelas.cpp

plugins/Greeter/Unity/Launcher/launchermodelas.h

plugins/Greeter/Unity/Launcher/plugin.cpp

plugins/Greeter/Unity/Launcher/plugin.h

plugins/Greeter/Unity/Launcher/qmldir

plugins/Greeter/Unity/Launcher/quicklistentry.cpp

plugins/Greeter/Unity/Launcher/quicklistentry.h

plugins/Greeter/Unity/Launcher/quicklistmodel.cpp

plugins/Greeter/Unity/Launcher/quicklistmodel.h

plugins/Unity/Launcher/asadapter.cpp

plugins/Unity/Launcher/asadapter.h

plugins/Utils/windowstatestorage.cpp

plugins/Utils/windowstatestorage.h

po/oc.po

tests/mocks/Unity/Notifications/MockNotificationModel.cpp

tests/mocks/Unity/Notifications/MockNotificationModel.h

tests/plugins/Greeter

tests/plugins/Greeter/CMakeLists.txt

tests/plugins/Greeter/Unity

tests/plugins/Greeter/Unity/CMakeLists.txt

tests/plugins/Greeter/Unity/Launcher

tests/plugins/Greeter/Unity/Launcher/AccountsServiceDBusAdaptor.cpp

tests/plugins/Greeter/Unity/Launcher/AccountsServiceDBusAdaptor.h

tests/plugins/Greeter/Unity/Launcher/CMakeLists.txt

tests/plugins/Greeter/Unity/Launcher/launchermodelastest.cpp

tests/plugins/Unity/Launcher/AccountsServiceDBusAdaptor.cpp

tests/plugins/Unity/Launcher/AccountsServiceDBusAdaptor.h

tests/qmltests/Notifications/Notification.qml

files renamed:
tests/mocks/Unity/Notifications/MockNotificationTypes.cpp => tests/mocks/Unity/Notifications/MockNotification.cpp

tests/mocks/Unity/Notifications/MockNotificationTypes.h => tests/mocks/Unity/Notifications/MockNotification.h

files modified:
debian/changelog

debian/control

debian/unity8-private.install

plugins/AccountsService/AccountsServiceDBusAdaptor.cpp

plugins/AccountsService/AccountsServiceDBusAdaptor.h

plugins/AccountsService/com.canonical.unity.AccountsService.xml

plugins/CMakeLists.txt

plugins/Unity/Indicators/indicator.cpp

plugins/Unity/Indicators/indicator.h

plugins/Unity/Indicators/indicatorsmanager.cpp

plugins/Unity/Indicators/indicatorsmanager.h

plugins/Unity/Indicators/indicatorsmodel.cpp

plugins/Unity/Indicators/indicatorsmodel.h

plugins/Unity/Indicators/modelactionrootstate.cpp

plugins/Unity/Indicators/unitymenumodelcache.cpp

plugins/Unity/Indicators/unitymenumodelcache.h

plugins/Unity/Launcher/CMakeLists.txt

plugins/Unity/Launcher/launchermodel.cpp

plugins/Unity/Launcher/launchermodel.h

plugins/Utils/CMakeLists.txt

plugins/Utils/plugin.cpp

po/be.po

po/gd.po

po/gl.po

qml/Dash/GenericScopeView.qml

qml/Dash/PageHeader.qml

qml/Greeter/CoverPage.qml

qml/Launcher/LauncherPanel.qml

qml/Notifications/Notification.qml

qml/Notifications/Notifications.qml

qml/Panel/Panel.qml

qml/Shell.qml

qml/Stages/DesktopStage.qml

qml/Stages/WindowMoveResizeArea.qml

tests/mocks/Unity/Indicators/fakeindicatorsmodel.cpp

tests/mocks/Unity/Indicators/fakeindicatorsmodel.h

tests/mocks/Unity/Launcher/CMakeLists.txt

tests/mocks/Unity/Launcher/MockLauncherModel.cpp

tests/mocks/Unity/Launcher/MockLauncherModel.h

tests/mocks/Unity/Notifications/CMakeLists.txt

tests/mocks/Unity/Notifications/MockActionModel.cpp

tests/mocks/Unity/Notifications/MockActionModel.h

tests/mocks/Unity/Notifications/plugin.cpp

tests/mocks/Unity/Notifications/plugin.h

tests/mocks/libusermetrics/UserMetrics.cpp

tests/plugins/CMakeLists.txt

tests/plugins/Unity/Indicators/indicatorsmanagertest.cpp

tests/plugins/Unity/Indicators/indicatorsmodeltest.cpp

tests/plugins/Unity/Indicators/sharedunitymenumodeltest.cpp

tests/plugins/Unity/Launcher/CMakeLists.txt

tests/plugins/Unity/Launcher/launchermodeltest.cpp

tests/qmltests/Launcher/tst_Launcher.qml

tests/qmltests/Notifications/tst_Notifications.qml

tests/qmltests/Notifications/tst_OptionToggle.qml

tests/qmltests/Notifications/tst_SwipeToAct.qml

tests/qmltests/Panel/tst_Panel.qml

tests/qmltests/Stages/tst_WindowMoveResizeArea.qml

tests/qmltests/tst_Shell.qml

tests/qmltests/tst_ShellWithPin.qml

Show diffs side-by-side

added added

removed removed

plugins/Greeter/Unity/Launcher/qmldir

1

module Unity.Launcher

2

plugin UnityLauncherAS-qml

3

typeinfo Launcher.qmltypes

Older »