<table><tr><td style="">leinir updated this revision to Diff 73544.<br />leinir added a comment.
</td><a style="text-decoration: none; padding: 4px 8px; margin: 0 8px 8px; float: right; color: #464C5C; font-weight: bold; border-radius: 3px; background-color: #F7F7F9; background-image: linear-gradient(to bottom,#fff,#f1f0f1); display: inline-block; border: 1px solid rgba(71,87,120,.2);" href="https://phabricator.kde.org/D26544">View Revision</a></tr></table><br /><div><div><ul class="remarkup-list">
<li class="remarkup-list-item">Merge remote-tracking branch 'origin/master' into switch-kcms-to-knsquick</li>
<li class="remarkup-list-item">Fix build (by removing stuff that was removed in master it seems)</li>
</ul></div></div><br /><div><strong>REPOSITORY</strong><div><div>R119 Plasma Desktop</div></div></div><br /><div><strong>CHANGES SINCE LAST UPDATE</strong><div><a href="https://phabricator.kde.org/D26544?vs=73409&id=73544">https://phabricator.kde.org/D26544?vs=73409&id=73544</a></div></div><br /><div><strong>BRANCH</strong><div><div>switch-kcms-to-knsquick (branched from master)</div></div></div><br /><div><strong>REVISION DETAIL</strong><div><a href="https://phabricator.kde.org/D26544">https://phabricator.kde.org/D26544</a></div></div><br /><div><strong>AFFECTED FILES</strong><div><div>CMakeLists.txt<br />
applets/icontasks/metadata.desktop<br />
applets/kicker/package/contents/ui/ActionMenu.qml<br />
applets/kicker/package/contents/ui/CompactRepresentation.qml<br />
applets/kicker/package/contents/ui/ConfigGeneral.qml<br />
applets/kicker/package/contents/ui/DashboardRepresentation.qml<br />
applets/kicker/package/contents/ui/DashboardTabBar.qml<br />
applets/kicker/package/contents/ui/DashboardTabButton.qml<br />
applets/kicker/package/contents/ui/ItemGridDelegate.qml<br />
applets/kicker/package/contents/ui/ItemGridView.qml<br />
applets/kicker/package/contents/ui/ItemListDelegate.qml<br />
applets/kicker/package/contents/ui/ItemListDialog.qml<br />
applets/kicker/package/contents/ui/ItemListView.qml<br />
applets/kicker/package/contents/ui/MenuRepresentation.qml<br />
applets/kicker/package/contents/ui/SideBarItem.qml<br />
applets/kicker/package/contents/ui/SideBarSection.qml<br />
applets/kicker/package/contents/ui/main.qml<br />
applets/kicker/package/metadata.desktop<br />
applets/kimpanel/backend/ibus/emojier/emojier.cpp<br />
applets/kimpanel/backend/ibus/emojier/org.kde.plasma.emojier.desktop<br />
applets/kimpanel/backend/ibus/emojier/resources.qrc<br />
applets/kimpanel/backend/ibus/emojier/ui/CategoryAction.qml<br />
applets/kimpanel/backend/ibus/emojier/ui/CategoryPage.qml<br />
applets/kimpanel/backend/ibus/emojier/ui/emojier.qml<br />
applets/kimpanel/package/contents/ui/main.qml<br />
applets/minimizeall/package/metadata.desktop<br />
applets/pager/package/contents/ui/main.qml<br />
applets/pager/plugin/windowmodel.cpp<br />
applets/showActivityManager/package/metadata.desktop<br />
applets/showdesktop/package/metadata.desktop<br />
applets/taskmanager/CMakeLists.txt<br />
applets/taskmanager/package/contents/ui/AudioStream.qml<br />
applets/taskmanager/package/contents/ui/MouseHandler.qml<br />
applets/taskmanager/package/contents/ui/PulseAudio.qml<br />
applets/taskmanager/package/contents/ui/Task.qml<br />
applets/taskmanager/package/contents/ui/ToolTipInstance.qml<br />
applets/taskmanager/package/contents/ui/code/layout.js<br />
applets/taskmanager/plugin/backend.cpp<br />
applets/taskmanager/plugin/backend.h<br />
applets/window-list/metadata.desktop<br />
containments/desktop/package/contents/ui/ConfigOverlay.qml<br />
containments/desktop/package/contents/ui/FolderView.qml<br />
containments/desktop/plugins/folder/autotests/positionertest.cpp<br />
containments/desktop/plugins/folder/foldermodel.cpp<br />
containments/panel/contents/ui/ConfigOverlay.qml<br />
design/plasmoids<br />
imports/activitymanager/CMakeLists.txt<br />
kcms/access/kcmaccess.desktop<br />
kcms/activities/BlacklistedApplicationsModel.cpp<br />
kcms/activities/CMakeLists.txt<br />
kcms/activities/ExtraActivitiesInterface.cpp<br />
kcms/activities/MainConfigurationWidget.cpp<br />
kcms/activities/MainConfigurationWidget.h<br />
kcms/activities/PrivacyTab.cpp<br />
kcms/activities/PrivacyTab.h<br />
kcms/activities/SwitchingTab.cpp<br />
kcms/activities/SwitchingTab.h<br />
kcms/activities/kactivitymanagerd_plugins_settings.kcfg<br />
kcms/activities/kactivitymanagerd_plugins_settings.kcfgc<br />
kcms/activities/kactivitymanagerd_settings.kcfg<br />
kcms/activities/kactivitymanagerd_settings.kcfgc<br />
kcms/activities/kcm_activities.desktop<br />
kcms/activities/qml/activitiesTab/ActivitiesView.qml<br />
kcms/activities/ui/PrivacyTabBase.ui<br />
kcms/activities/utils/dbusfuture_p.cpp<br />
kcms/activities/utils/dbusfuture_p.h<br />
kcms/autostart/autostart.cpp<br />
kcms/autostart/autostart.desktop<br />
kcms/baloo/CMakeLists.txt<br />
kcms/baloo/Messages.sh<br />
kcms/baloo/filteredfoldermodel.cpp<br />
kcms/baloo/kcm_baloofile.desktop<br />
kcms/baloo/package/metadata.desktop<br />
kcms/colors/CMakeLists.txt<br />
kcms/colors/colors.cpp<br />
kcms/colors/colors.h<br />
kcms/colors/colorsmodel.cpp<br />
kcms/colors/editor/org.kde.kcolorschemeeditor.desktop<br />
kcms/colors/filterproxymodel.cpp<br />
kcms/colors/kcm_colors.desktop<br />
kcms/colors/package/contents/ui/main.qml<br />
kcms/colors/package/metadata.desktop<br />
kcms/componentchooser/CMakeLists.txt<br />
kcms/componentchooser/EXAMPLE.desktop<br />
kcms/componentchooser/browser_settings.kcfg<br />
kcms/componentchooser/browser_settings.kcfgc<br />
kcms/componentchooser/componentchooser.cpp<br />
kcms/componentchooser/componentchooser.desktop<br />
kcms/componentchooser/componentchooser.h<br />
kcms/componentchooser/componentchooserbrowser.cpp<br />
kcms/componentchooser/componentchooserbrowser.h<br />
kcms/componentchooser/componentchooseremail.cpp<br />
kcms/componentchooser/componentchooseremail.h<br />
kcms/componentchooser/componentchooserfilemanager.cpp<br />
kcms/componentchooser/componentchooserfilemanager.h<br />
kcms/componentchooser/componentchooserterminal.cpp<br />
kcms/componentchooser/componentchooserterminal.h<br />
kcms/componentchooser/componentservices/kcm_browser.desktop<br />
kcms/componentchooser/componentservices/kcm_filemanager.desktop<br />
kcms/componentchooser/componentservices/kcm_kemail.desktop<br />
kcms/componentchooser/componentservices/kcm_terminal.desktop<br />
kcms/componentchooser/kcm_componentchooser.cpp<br />
kcms/componentchooser/terminal_settings.kcfg<br />
kcms/componentchooser/terminal_settings.kcfgc<br />
kcms/cursortheme/CMakeLists.txt<br />
kcms/cursortheme/cursorthemesettings.kcfgc<br />
kcms/cursortheme/kcm_cursortheme.desktop<br />
kcms/cursortheme/kcmcursortheme.cpp<br />
kcms/cursortheme/kcmcursortheme.h<br />
kcms/cursortheme/package/contents/ui/main.qml<br />
kcms/cursortheme/package/metadata.desktop<br />
kcms/cursortheme/xcursor/thememodel.cpp<br />
kcms/cursortheme/xcursor/xcursortheme.cpp<br />
kcms/dateandtime/dtime.cpp<br />
kcms/dateandtime/helper.cpp<br />
kcms/desktoppaths/CMakeLists.txt<br />
kcms/desktoppaths/desktoppathssettings.cpp<br />
kcms/desktoppaths/desktoppathssettings.h<br />
kcms/desktoppaths/globalpaths.cpp<br />
kcms/desktoppaths/globalpaths.h<br />
kcms/desktoppaths/globalpaths.ui<br />
kcms/desktoptheme/CMakeLists.txt<br />
kcms/desktoptheme/filterproxymodel.cpp<br />
kcms/desktoptheme/filterproxymodel.h<br />
kcms/desktoptheme/kcm.cpp<br />
kcms/desktoptheme/kcm.h<br />
kcms/desktoptheme/kcm_desktoptheme.desktop<br />
kcms/desktoptheme/package/contents/ui/ThemePreview.qml<br />
kcms/desktoptheme/package/contents/ui/main.qml<br />
kcms/desktoptheme/package/metadata.desktop<br />
kcms/desktoptheme/plasma-themes.knsrc<br />
kcms/desktoptheme/themesmodel.cpp<br />
kcms/desktoptheme/themesmodel.h<br />
kcms/emoticons/emoticons.desktop<br />
kcms/fonts/fonts.cpp<br />
kcms/fonts/fonts.h<br />
kcms/fonts/kcm_fonts.desktop<br />
kcms/fonts/package/contents/ui/main.qml<br />
kcms/fonts/package/metadata.desktop<br />
kcms/formats/formats.desktop<br />
kcms/hardware/joystick/joystick.desktop<br />
kcms/icons/CMakeLists.txt<br />
kcms/icons/changeicons.cpp<br />
kcms/icons/iconsizecategorymodel.cpp<br />
kcms/icons/iconsizecategorymodel.h<br />
kcms/icons/iconsmodel.cpp<br />
kcms/icons/iconsmodel.h<br />
kcms/icons/iconssettings.cpp<br />
kcms/icons/iconssettings.h<br />
kcms/icons/iconssettingsbase.kcfg<br />
kcms/icons/iconssettingsbase.kcfgc<br />
kcms/icons/kcm_icons.desktop<br />
kcms/icons/main.cpp<br />
kcms/icons/main.h<br />
kcms/icons/package/contents/ui/IconSizePopup.qml<br />
kcms/icons/package/contents/ui/main.qml<br />
kcms/icons/package/metadata.desktop<br />
kcms/keyboard/kcm_keyboard.desktop<br />
kcms/keyboard/tastenbrett/qml/ShapeCanvas.qml<br />
kcms/keyboard/tastenbrett/qml/main.qml<br />
kcms/keys/kglobalshortcutseditor.cpp<br />
kcms/kfontinst/apps/Viewer.cpp<br />
kcms/kfontinst/dbus/fontinst.actions<br />
kcms/kfontinst/kcmfontinst/fontinst.desktop<br />
kcms/kfontinst/lib/Fc.cpp<br />
kcms/ksmserver/kcmsmserver.desktop<br />
kcms/ksmserver/smserverconfigdlg.ui<br />
kcms/ksplash/CMakeLists.txt<br />
kcms/ksplash/kcm.cpp<br />
kcms/ksplash/kcm.h<br />
kcms/ksplash/kcm_splashscreen.desktop<br />
kcms/ksplash/package/contents/ui/main.qml<br />
kcms/ksplash/package/metadata.desktop<br />
kcms/lookandfeel/CMakeLists.txt<br />
kcms/lookandfeel/autotests/CMakeLists.txt<br />
kcms/lookandfeel/config-kcm.h.cmake<br />
kcms/lookandfeel/kcm.cpp<br />
kcms/lookandfeel/kcm_lookandfeel.desktop<br />
kcms/lookandfeel/lookandfeel.knsrc<br />
kcms/lookandfeel/package/metadata.desktop<br />
kcms/mouse/kcm/libinput/main.qml<br />
kcms/mouse/kcm/libinput/main_deviceless.qml<br />
kcms/nightcolor/kcm_nightcolor.desktop<br />
kcms/nightcolor/package/contents/ui/LocationsAutoView.qml<br />
kcms/nightcolor/package/contents/ui/LocationsFixedView.qml<br />
kcms/nightcolor/package/contents/ui/TimingsView.qml<br />
kcms/nightcolor/package/contents/ui/main.qml<br />
kcms/nightcolor/package/metadata.desktop<br />
kcms/notifications/CMakeLists.txt<br />
kcms/notifications/kcm.cpp<br />
kcms/notifications/kcm.h<br />
kcms/notifications/package/contents/ui/ApplicationConfiguration.qml<br />
kcms/notifications/package/contents/ui/SourcesPage.qml<br />
kcms/notifications/package/contents/ui/main.qml<br />
kcms/notifications/sourcesmodel.cpp<br />
kcms/qtquicksettings/qtquicksettings.desktop<br />
kcms/runners/kcm.cpp<br />
kcms/runners/kcm_plasmasearch.desktop<br />
kcms/solid_actions/device-actions/solid-device-Battery.desktop<br />
kcms/solid_actions/device-actions/solid-device-Block.desktop<br />
kcms/solid_actions/device-actions/solid-device-Camera.desktop<br />
kcms/solid_actions/device-actions/solid-device-OpticalDisc.desktop<br />
kcms/solid_actions/device-actions/solid-device-OpticalDrive.desktop<br />
kcms/solid_actions/device-actions/solid-device-PortableMediaPlayer.desktop<br />
kcms/solid_actions/device-actions/solid-device-Processor.desktop<br />
kcms/solid_actions/device-actions/solid-device-StorageAccess.desktop<br />
kcms/solid_actions/device-actions/solid-device-StorageDrive.desktop<br />
kcms/solid_actions/device-actions/solid-device-StorageVolume.desktop<br />
kcms/solid_actions/solid-actions.desktop<br />
kcms/solid_actions/solid-device-type.desktop<br />
kcms/spellchecking/spellchecking.desktop<br />
kcms/style/CMakeLists.txt<br />
kcms/style/Messages.sh<br />
kcms/style/kcm_style.desktop<br />
kcms/style/package/contents/ui/main.qml<br />
kcms/style/package/metadata.desktop<br />
kcms/touchpad/src/kcm/kcm_touchpad.desktop<br />
kcms/touchpad/src/kded/kcm_touchpad.notifyrc<br />
kcms/touchpad/src/kded/kded_touchpad.desktop<br />
kcms/workspaceoptions/kcm_workspace.desktop<br />
kcms/workspaceoptions/package/contents/ui/main.qml<br />
kcms/workspaceoptions/package/metadata.desktop<br />
kcms/workspaceoptions/workspaceoptions_kdeglobalssettings.kcfg<br />
kcms/workspaceoptions/workspaceoptions_kdeglobalssettings.kcfgc<br />
layout-templates/org.kde.plasma.desktop.defaultPanel/metadata.desktop<br />
org.kde.plasmashell.metainfo.xml<br />
runners/plasma-desktop/plasma-runner-plasma-desktop.desktop<br />
solid-device-automounter/kcm/device_automounter_kcm.desktop<br />
solid-device-automounter/kded/device_automounter.desktop<br />
toolboxes/desktoptoolbox/metadata.desktop<br />
toolboxes/paneltoolbox/metadata.desktop<br />
toolboxes/plasma-toolbox-paneltoolbox.desktop</div></div></div><br /><div><strong>To: </strong>leinir, mart, ngraham<br /><strong>Cc: </strong>bcooksley, davidedmundson, ngraham, plasma-devel, LeGast00n, The-Feren-OS-Dev, jraleigh, zachus, fbampaloukas, GB_2, ragreen, ZrenBot, alexeymin, himcesjf, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, ahiemstra, mart<br /></div>