Viewing all changes in revision 2341.2.9.
- Committer: Albert Astals Cid
- Date: 2016-11-28 09:57:06 UTC
- mfrom: (2704 unity8)
- mto: (2659.4.2 ecm_optional_santizers)
- mto: This revision was merged to the branch mainline in revision 2728.
- Revision ID: albert.astals@canonical.com-20161128095706-rzjv4q9a6mvuz6wd
Merge
- files added:
- .crossbuilder
- plugins/ImageCache
- plugins/LightDM/FullLightDM
- plugins/LightDM/IntegratedLightDM
- plugins/LightDM/IntegratedLightDM/QLightDM
- qml/Components/MediaServices
- qml/Dash/Previews/PreviewSingleton
- qml/Greeter/graphics/session_icons
- qml/Stage/Spread
- tests/mocks/Biometryd
- tests/mocks/LightDM/IntegratedLightDM
- tests/mocks/SessionBroadcast
- tests/plugins/ImageCache
- tests/plugins/ImageCache/graphics
- tests/plugins/LightDM/IntegratedLightDM
- tests/plugins/SessionBroadcast
- tests/plugins/Unity/Launcher/applications
- files removed:
- plugins/AccountsService/AccountsService.qmltypes
- qml/Components/ListItems/graphics
- tests/mocks/libusermetrics/libusermetricsoutput/ColorTheme.h
- tests/mocks/libusermetrics/libusermetricsoutput/UserMetrics.h
- files renamed:
- plugins/IntegratedLightDM/ => plugins/LightDM/
- plugins/IntegratedLightDM/liblightdm/ => plugins/LightDM/IntegratedLightDM/liblightdm/
- qml/Dash/Previews/PreviewSharing.qml => qml/Components/SharingPicker.qml
- qml/Components/ListItems/Header.qml => qml/Dash/DashSectionHeader.qml
- qml/Components/Circle.qml => qml/Greeter/Circle.qml
- qml/Components/DelayedLockscreen.qml => qml/Greeter/DelayedLockscreen.qml
- qml/Greeter/LightDM.qml => qml/Greeter/LightDMService.qml
- qml/Stages/ => qml/Stage/
- qml/Stages/DesktopStage.qml => qml/Stage/Stage.qml
- qml/Stages/graphics/dropshadow2gu@30.png => qml/graphics/dropshadow2gu@30.png
- qml/Stages/graphics/dropshadow2gu@30.sci => qml/graphics/dropshadow2gu@30.sci
- tests/mocks/IntegratedLightDM/ => tests/mocks/LightDM/
- tests/mocks/IntegratedLightDM/CMakeLists.txt => tests/mocks/LightDM/IntegratedLightDM/CMakeLists.txt
- tests/mocks/IntegratedLightDM/MockGreeter.cpp => tests/mocks/LightDM/IntegratedLightDM/MockGreeter.cpp
- tests/mocks/IntegratedLightDM/MockGreeter.h => tests/mocks/LightDM/IntegratedLightDM/MockGreeter.h
- tests/mocks/IntegratedLightDM/MockUsersModel.cpp => tests/mocks/LightDM/IntegratedLightDM/MockUsersModel.cpp
- tests/mocks/IntegratedLightDM/MockUsersModel.h => tests/mocks/LightDM/IntegratedLightDM/MockUsersModel.h
- tests/mocks/IntegratedLightDM/QLightDM/ => tests/mocks/LightDM/IntegratedLightDM/QLightDM/
- tests/mocks/IntegratedLightDM/liblightdm/ => tests/mocks/LightDM/IntegratedLightDM/liblightdm/
- tests/mocks/IntegratedLightDM/plugin.cpp => tests/mocks/LightDM/IntegratedLightDM/plugin.cpp
- tests/mocks/IntegratedLightDM/plugin.h => tests/mocks/LightDM/IntegratedLightDM/plugin.h
- tests/mocks/IntegratedLightDM/qmldir => tests/mocks/LightDM/IntegratedLightDM/qmldir
- tests/mocks/QtMultimedia/audio.cpp => tests/mocks/QtMultimedia/mediaplayer.cpp
- tests/mocks/QtMultimedia/audio.h => tests/mocks/QtMultimedia/mediaplayer.h
- tests/plugins/IntegratedLightDM/ => tests/plugins/LightDM/
- tests/plugins/IntegratedLightDM/CMakeLists.txt => tests/plugins/LightDM/IntegratedLightDM/CMakeLists.txt
- tests/plugins/IntegratedLightDM/dbus.cpp => tests/plugins/LightDM/IntegratedLightDM/dbus.cpp
- tests/plugins/IntegratedLightDM/greeter.qml => tests/plugins/LightDM/IntegratedLightDM/greeter.qml
- tests/plugins/IntegratedLightDM/integrated.cpp => tests/plugins/LightDM/IntegratedLightDM/integrated.cpp
- tests/plugins/IntegratedLightDM/pam.cpp => tests/plugins/LightDM/IntegratedLightDM/pam.cpp
- tests/plugins/IntegratedLightDM/usersmodel.cpp => tests/plugins/LightDM/IntegratedLightDM/usersmodel.cpp
- tests/plugins/Unity/Launcher/abs-icon.desktop => tests/plugins/Unity/Launcher/applications/abs-icon.desktop
- tests/plugins/Unity/Launcher/click-icon.desktop => tests/plugins/Unity/Launcher/applications/click-icon.desktop
- tests/plugins/Unity/Launcher/click-icon.svg => tests/plugins/Unity/Launcher/applications/click-icon.svg
- tests/plugins/Unity/Launcher/no-name.desktop => tests/plugins/Unity/Launcher/applications/no-name.desktop
- tests/plugins/Unity/Launcher/rel-icon.desktop => tests/plugins/Unity/Launcher/applications/rel-icon.desktop
- tests/plugins/Unity/Launcher/rel-icon.svg => tests/plugins/Unity/Launcher/applications/rel-icon.svg
- tests/qmltests/Dash/Previews/tst_PreviewSharing.qml => tests/qmltests/Components/tst_SharingPicker.qml
- tests/qmltests/Stages/ => tests/qmltests/Stage/
- files modified:
- CMakeLists.txt
expand all
collapse all
added
removed
data/unity8-dash.png
plugins/Dash/graphics/music_progress_bg.png
qml/Components/ListItems/graphics/ListItemDividerHorizontal@18.png
qml/Components/graphics/close@20.png
qml/Components/graphics/icon_star_empty@20.png
qml/Components/graphics/icon_star_full@20.png
qml/Components/graphics/icon_star_half@20.png
qml/Components/graphics/icon_star_off@20.png
qml/Components/graphics/icon_star_on@20.png
qml/Components/graphics/non-selected@18.png
qml/Components/graphics/window-close.svg
qml/Components/graphics/window-maximize.svg
qml/Components/graphics/window-minimize.svg
qml/Components/graphics/window-window.svg
qml/Dash/graphics/dash_divider_top_darkgrad@27.png
qml/Dash/graphics/dash_divider_top_lightgrad@27.png
qml/Dash/graphics/header_handlearrow2@27.png
qml/Dash/graphics/header_handlearrow@27.png
qml/Dash/graphics/icon_clear@20.png
qml/Dash/graphics/icon_search_active@20.png
qml/Dash/graphics/icon_search_inactive@20.png
qml/Dash/graphics/navigation_shadow@18.png
qml/Dash/graphics/navigation_shadow_light@18.png
qml/Dash/graphics/overview_hint@27.png
qml/Dash/graphics/overview_hint@30.png
qml/Dash/graphics/pagination_dot_off@30.png
qml/Dash/graphics/pagination_dot_on@30.png
qml/Dash/graphics/paper.png
qml/Dash/graphics/pixel.png
qml/Dash/graphics/play_button@18.png
qml/Dash/graphics/play_button_active@18.png
qml/Dash/graphics/play_button_active_big@20.png
qml/Dash/graphics/play_button_big@20.png
qml/Dash/graphics/tabbarchevron@27.png
qml/Dash/graphics/tablet/icon_close_preview@20.png
qml/Dash/graphics/tooltip_arrow@27.png
qml/Greeter/graphics/dot_empty.png
qml/Greeter/graphics/dot_filled.png
qml/Greeter/graphics/dot_pointer.png
qml/Greeter/graphics/icon_arrow.png
qml/Greeter/graphics/infographic_circle_back.png
qml/Greeter/graphics/session_icons/gnome_badge.png
qml/Greeter/graphics/session_icons/kde_badge.png
qml/Greeter/graphics/session_icons/recovery_console_badge.png
qml/Greeter/graphics/session_icons/ubuntu_badge.png
qml/Greeter/graphics/session_icons/unknown_badge.png
qml/Launcher/graphics/divider-line.png
qml/Launcher/graphics/focused_app_arrow@30.png
qml/Launcher/graphics/home@18.png
qml/Launcher/graphics/quicklist_tooltip@30.png
qml/Panel/graphics/rectangular_dropshadow@30.png
qml/Stage/graphics/PageHeaderBaseDividerBottom@18.png
qml/Stage/graphics/PageHeaderBaseDividerLight@18.png
qml/Stage/graphics/arrows-centre.png
qml/Stage/graphics/arrows.png
qml/Stage/graphics/sidestage_handle@20.png
qml/Tutorial/graphics/background1.png
qml/Tutorial/graphics/background2.png
qml/Wizard/Pages/data/Desktop_header_bkg.png
qml/Wizard/Pages/data/Desktop_splash_screen_bkg.png
qml/Wizard/Pages/data/Phone_header_bkg.png
qml/Wizard/Pages/data/Phone_splash_screen_bkg.png
qml/Wizard/Pages/data/Tick@30.png
qml/Wizard/Pages/data/timezonemap/map.png
qml/Wizard/Pages/data/timezonemap/pin.png
qml/Wizard/Pages/data/timezonemap/timezone_-1.png
qml/Wizard/Pages/data/timezonemap/timezone_-10.png
qml/Wizard/Pages/data/timezonemap/timezone_-11.png
qml/Wizard/Pages/data/timezonemap/timezone_-2.png
qml/Wizard/Pages/data/timezonemap/timezone_-3.5.png
qml/Wizard/Pages/data/timezonemap/timezone_-3.png
qml/Wizard/Pages/data/timezonemap/timezone_-4.5.png
qml/Wizard/Pages/data/timezonemap/timezone_-4.png
qml/Wizard/Pages/data/timezonemap/timezone_-5.png
qml/Wizard/Pages/data/timezonemap/timezone_-6.png
qml/Wizard/Pages/data/timezonemap/timezone_-7.png
qml/Wizard/Pages/data/timezonemap/timezone_-8.png
qml/Wizard/Pages/data/timezonemap/timezone_-9.5.png
qml/Wizard/Pages/data/timezonemap/timezone_-9.png
qml/Wizard/Pages/data/timezonemap/timezone_0.png
qml/Wizard/Pages/data/timezonemap/timezone_1.png
qml/Wizard/Pages/data/timezonemap/timezone_10.5.png
qml/Wizard/Pages/data/timezonemap/timezone_10.png
qml/Wizard/Pages/data/timezonemap/timezone_11.png
qml/Wizard/Pages/data/timezonemap/timezone_12.75.png
qml/Wizard/Pages/data/timezonemap/timezone_12.png
qml/Wizard/Pages/data/timezonemap/timezone_13.png
qml/Wizard/Pages/data/timezonemap/timezone_2.png
qml/Wizard/Pages/data/timezonemap/timezone_3.5.png
qml/Wizard/Pages/data/timezonemap/timezone_3.png
qml/Wizard/Pages/data/timezonemap/timezone_4.5.png
qml/Wizard/Pages/data/timezonemap/timezone_4.png
qml/Wizard/Pages/data/timezonemap/timezone_5.5.png
qml/Wizard/Pages/data/timezonemap/timezone_5.75.png
qml/Wizard/Pages/data/timezonemap/timezone_5.png
qml/Wizard/Pages/data/timezonemap/timezone_6.5.png
qml/Wizard/Pages/data/timezonemap/timezone_6.png
qml/Wizard/Pages/data/timezonemap/timezone_7.png
qml/Wizard/Pages/data/timezonemap/timezone_8.5.png
qml/Wizard/Pages/data/timezonemap/timezone_8.png
qml/Wizard/Pages/data/timezonemap/timezone_9.5.png
qml/Wizard/Pages/data/timezonemap/timezone_9.png
qml/graphics/dropshadow2gu@30.png
qml/graphics/dropshadow_left@20.png
qml/graphics/dropshadow_right@20.png
qml/graphics/phone_background.jpg
qml/graphics/tablet_background.jpg
tests/data/unity/backgrounds/blue.png
tests/data/unity/backgrounds/red.png
tests/graphics/applicationIcons/browser@18.png
tests/graphics/applicationIcons/calendar@18.png
tests/graphics/applicationIcons/camera@18.png
tests/graphics/applicationIcons/contacts-app@18.png
tests/graphics/applicationIcons/dash.png
tests/graphics/applicationIcons/dash@18.png
tests/graphics/applicationIcons/dialer-app@18.png
tests/graphics/applicationIcons/evernote@18.png
tests/graphics/applicationIcons/facebook@18.png
tests/graphics/applicationIcons/gallery@18.png
tests/graphics/applicationIcons/gmail@18.png
tests/graphics/applicationIcons/libreoffice@18.png
tests/graphics/applicationIcons/map@18.png
tests/graphics/applicationIcons/messages-app@18.png
tests/graphics/applicationIcons/notepad@18.png
tests/graphics/applicationIcons/pinterest@18.png
tests/graphics/applicationIcons/soundcloud@18.png
tests/graphics/applicationIcons/system-settings@18.png
tests/graphics/applicationIcons/twitter@18.png
tests/graphics/applicationIcons/weather@18.png
tests/graphics/applicationIcons/wikipedia@18.png
tests/graphics/applicationIcons/youtube@18.png
tests/graphics/avatars/amanda@12.png
tests/graphics/avatars/anna_olsson@12.png
tests/graphics/avatars/funky@12.png
tests/graphics/clock@18.png
tests/mocks/Unity/Application/resources/screenshots/browser@12.png
tests/mocks/Unity/Application/resources/screenshots/camera@12.png
tests/mocks/Unity/Application/resources/screenshots/dialer@12.png
tests/mocks/Unity/Application/resources/screenshots/facebook@12.png
tests/mocks/Unity/Application/resources/screenshots/gallery@12.png
tests/mocks/Unity/Application/resources/screenshots/libreoffice@12.png
tests/mocks/Unity/Application/resources/screenshots/map@12.png
tests/mocks/Unity/Application/resources/screenshots/music@12.png
tests/mocks/Unity/Application/resources/screenshots/twitter@12.png
tests/mocks/Unity/Application/resources/screenshots/unity8-dash@12.png
tests/mocks/Unity/Application/resources/screenshots/vkb_portrait.png
tests/mocks/Unity/Application/resources/vkb_portrait.png
tests/plugins/ImageCache/graphics/wide.jpg
tests/qmltests/Components/tst_LazyImage/portrait.png
tests/qmltests/Components/tst_LazyImage/square.png
tests/qmltests/Components/tst_LazyImage/wide.png
tests/qmltests/Dash/artwork/avatar@12.png
tests/qmltests/Dash/artwork/background.png
tests/qmltests/Dash/artwork/checkers.png
tests/qmltests/Dash/artwork/emblem.png
tests/qmltests/Dash/artwork/music-player-design.png
tests/qmltests/UnityLogo.png
