leinir updated this revision to Diff 73544. leinir added a comment.
- Merge remote-tracking branch 'origin/master' into switch-kcms-to-knsquick - Fix build (by removing stuff that was removed in master it seems) REPOSITORY R119 Plasma Desktop CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D26544?vs=73409&id=73544 BRANCH switch-kcms-to-knsquick (branched from master) REVISION DETAIL https://phabricator.kde.org/D26544 AFFECTED FILES CMakeLists.txt applets/icontasks/metadata.desktop applets/kicker/package/contents/ui/ActionMenu.qml applets/kicker/package/contents/ui/CompactRepresentation.qml applets/kicker/package/contents/ui/ConfigGeneral.qml applets/kicker/package/contents/ui/DashboardRepresentation.qml applets/kicker/package/contents/ui/DashboardTabBar.qml applets/kicker/package/contents/ui/DashboardTabButton.qml applets/kicker/package/contents/ui/ItemGridDelegate.qml applets/kicker/package/contents/ui/ItemGridView.qml applets/kicker/package/contents/ui/ItemListDelegate.qml applets/kicker/package/contents/ui/ItemListDialog.qml applets/kicker/package/contents/ui/ItemListView.qml applets/kicker/package/contents/ui/MenuRepresentation.qml applets/kicker/package/contents/ui/SideBarItem.qml applets/kicker/package/contents/ui/SideBarSection.qml applets/kicker/package/contents/ui/main.qml applets/kicker/package/metadata.desktop applets/kimpanel/backend/ibus/emojier/emojier.cpp applets/kimpanel/backend/ibus/emojier/org.kde.plasma.emojier.desktop applets/kimpanel/backend/ibus/emojier/resources.qrc applets/kimpanel/backend/ibus/emojier/ui/CategoryAction.qml applets/kimpanel/backend/ibus/emojier/ui/CategoryPage.qml applets/kimpanel/backend/ibus/emojier/ui/emojier.qml applets/kimpanel/package/contents/ui/main.qml applets/minimizeall/package/metadata.desktop applets/pager/package/contents/ui/main.qml applets/pager/plugin/windowmodel.cpp applets/showActivityManager/package/metadata.desktop applets/showdesktop/package/metadata.desktop applets/taskmanager/CMakeLists.txt applets/taskmanager/package/contents/ui/AudioStream.qml applets/taskmanager/package/contents/ui/MouseHandler.qml applets/taskmanager/package/contents/ui/PulseAudio.qml applets/taskmanager/package/contents/ui/Task.qml applets/taskmanager/package/contents/ui/ToolTipInstance.qml applets/taskmanager/package/contents/ui/code/layout.js applets/taskmanager/plugin/backend.cpp applets/taskmanager/plugin/backend.h applets/window-list/metadata.desktop containments/desktop/package/contents/ui/ConfigOverlay.qml containments/desktop/package/contents/ui/FolderView.qml containments/desktop/plugins/folder/autotests/positionertest.cpp containments/desktop/plugins/folder/foldermodel.cpp containments/panel/contents/ui/ConfigOverlay.qml design/plasmoids imports/activitymanager/CMakeLists.txt kcms/access/kcmaccess.desktop kcms/activities/BlacklistedApplicationsModel.cpp kcms/activities/CMakeLists.txt kcms/activities/ExtraActivitiesInterface.cpp kcms/activities/MainConfigurationWidget.cpp kcms/activities/MainConfigurationWidget.h kcms/activities/PrivacyTab.cpp kcms/activities/PrivacyTab.h kcms/activities/SwitchingTab.cpp kcms/activities/SwitchingTab.h kcms/activities/kactivitymanagerd_plugins_settings.kcfg kcms/activities/kactivitymanagerd_plugins_settings.kcfgc kcms/activities/kactivitymanagerd_settings.kcfg kcms/activities/kactivitymanagerd_settings.kcfgc kcms/activities/kcm_activities.desktop kcms/activities/qml/activitiesTab/ActivitiesView.qml kcms/activities/ui/PrivacyTabBase.ui kcms/activities/utils/dbusfuture_p.cpp kcms/activities/utils/dbusfuture_p.h kcms/autostart/autostart.cpp kcms/autostart/autostart.desktop kcms/baloo/CMakeLists.txt kcms/baloo/Messages.sh kcms/baloo/filteredfoldermodel.cpp kcms/baloo/kcm_baloofile.desktop kcms/baloo/package/metadata.desktop kcms/colors/CMakeLists.txt kcms/colors/colors.cpp kcms/colors/colors.h kcms/colors/colorsmodel.cpp kcms/colors/editor/org.kde.kcolorschemeeditor.desktop kcms/colors/filterproxymodel.cpp kcms/colors/kcm_colors.desktop kcms/colors/package/contents/ui/main.qml kcms/colors/package/metadata.desktop kcms/componentchooser/CMakeLists.txt kcms/componentchooser/EXAMPLE.desktop kcms/componentchooser/browser_settings.kcfg kcms/componentchooser/browser_settings.kcfgc kcms/componentchooser/componentchooser.cpp kcms/componentchooser/componentchooser.desktop kcms/componentchooser/componentchooser.h kcms/componentchooser/componentchooserbrowser.cpp kcms/componentchooser/componentchooserbrowser.h kcms/componentchooser/componentchooseremail.cpp kcms/componentchooser/componentchooseremail.h kcms/componentchooser/componentchooserfilemanager.cpp kcms/componentchooser/componentchooserfilemanager.h kcms/componentchooser/componentchooserterminal.cpp kcms/componentchooser/componentchooserterminal.h kcms/componentchooser/componentservices/kcm_browser.desktop kcms/componentchooser/componentservices/kcm_filemanager.desktop kcms/componentchooser/componentservices/kcm_kemail.desktop kcms/componentchooser/componentservices/kcm_terminal.desktop kcms/componentchooser/kcm_componentchooser.cpp kcms/componentchooser/terminal_settings.kcfg kcms/componentchooser/terminal_settings.kcfgc kcms/cursortheme/CMakeLists.txt kcms/cursortheme/cursorthemesettings.kcfgc kcms/cursortheme/kcm_cursortheme.desktop kcms/cursortheme/kcmcursortheme.cpp kcms/cursortheme/kcmcursortheme.h kcms/cursortheme/package/contents/ui/main.qml kcms/cursortheme/package/metadata.desktop kcms/cursortheme/xcursor/thememodel.cpp kcms/cursortheme/xcursor/xcursortheme.cpp kcms/dateandtime/dtime.cpp kcms/dateandtime/helper.cpp kcms/desktoppaths/CMakeLists.txt kcms/desktoppaths/desktoppathssettings.cpp kcms/desktoppaths/desktoppathssettings.h kcms/desktoppaths/globalpaths.cpp kcms/desktoppaths/globalpaths.h kcms/desktoppaths/globalpaths.ui kcms/desktoptheme/CMakeLists.txt kcms/desktoptheme/filterproxymodel.cpp kcms/desktoptheme/filterproxymodel.h kcms/desktoptheme/kcm.cpp kcms/desktoptheme/kcm.h kcms/desktoptheme/kcm_desktoptheme.desktop kcms/desktoptheme/package/contents/ui/ThemePreview.qml kcms/desktoptheme/package/contents/ui/main.qml kcms/desktoptheme/package/metadata.desktop kcms/desktoptheme/plasma-themes.knsrc kcms/desktoptheme/themesmodel.cpp kcms/desktoptheme/themesmodel.h kcms/emoticons/emoticons.desktop kcms/fonts/fonts.cpp kcms/fonts/fonts.h kcms/fonts/kcm_fonts.desktop kcms/fonts/package/contents/ui/main.qml kcms/fonts/package/metadata.desktop kcms/formats/formats.desktop kcms/hardware/joystick/joystick.desktop kcms/icons/CMakeLists.txt kcms/icons/changeicons.cpp kcms/icons/iconsizecategorymodel.cpp kcms/icons/iconsizecategorymodel.h kcms/icons/iconsmodel.cpp kcms/icons/iconsmodel.h kcms/icons/iconssettings.cpp kcms/icons/iconssettings.h kcms/icons/iconssettingsbase.kcfg kcms/icons/iconssettingsbase.kcfgc kcms/icons/kcm_icons.desktop kcms/icons/main.cpp kcms/icons/main.h kcms/icons/package/contents/ui/IconSizePopup.qml kcms/icons/package/contents/ui/main.qml kcms/icons/package/metadata.desktop kcms/keyboard/kcm_keyboard.desktop kcms/keyboard/tastenbrett/qml/ShapeCanvas.qml kcms/keyboard/tastenbrett/qml/main.qml kcms/keys/kglobalshortcutseditor.cpp kcms/kfontinst/apps/Viewer.cpp kcms/kfontinst/dbus/fontinst.actions kcms/kfontinst/kcmfontinst/fontinst.desktop kcms/kfontinst/lib/Fc.cpp kcms/ksmserver/kcmsmserver.desktop kcms/ksmserver/smserverconfigdlg.ui kcms/ksplash/CMakeLists.txt kcms/ksplash/kcm.cpp kcms/ksplash/kcm.h kcms/ksplash/kcm_splashscreen.desktop kcms/ksplash/package/contents/ui/main.qml kcms/ksplash/package/metadata.desktop kcms/lookandfeel/CMakeLists.txt kcms/lookandfeel/autotests/CMakeLists.txt kcms/lookandfeel/config-kcm.h.cmake kcms/lookandfeel/kcm.cpp kcms/lookandfeel/kcm_lookandfeel.desktop kcms/lookandfeel/lookandfeel.knsrc kcms/lookandfeel/package/metadata.desktop kcms/mouse/kcm/libinput/main.qml kcms/mouse/kcm/libinput/main_deviceless.qml kcms/nightcolor/kcm_nightcolor.desktop kcms/nightcolor/package/contents/ui/LocationsAutoView.qml kcms/nightcolor/package/contents/ui/LocationsFixedView.qml kcms/nightcolor/package/contents/ui/TimingsView.qml kcms/nightcolor/package/contents/ui/main.qml kcms/nightcolor/package/metadata.desktop kcms/notifications/CMakeLists.txt kcms/notifications/kcm.cpp kcms/notifications/kcm.h kcms/notifications/package/contents/ui/ApplicationConfiguration.qml kcms/notifications/package/contents/ui/SourcesPage.qml kcms/notifications/package/contents/ui/main.qml kcms/notifications/sourcesmodel.cpp kcms/qtquicksettings/qtquicksettings.desktop kcms/runners/kcm.cpp kcms/runners/kcm_plasmasearch.desktop kcms/solid_actions/device-actions/solid-device-Battery.desktop kcms/solid_actions/device-actions/solid-device-Block.desktop kcms/solid_actions/device-actions/solid-device-Camera.desktop kcms/solid_actions/device-actions/solid-device-OpticalDisc.desktop kcms/solid_actions/device-actions/solid-device-OpticalDrive.desktop kcms/solid_actions/device-actions/solid-device-PortableMediaPlayer.desktop kcms/solid_actions/device-actions/solid-device-Processor.desktop kcms/solid_actions/device-actions/solid-device-StorageAccess.desktop kcms/solid_actions/device-actions/solid-device-StorageDrive.desktop kcms/solid_actions/device-actions/solid-device-StorageVolume.desktop kcms/solid_actions/solid-actions.desktop kcms/solid_actions/solid-device-type.desktop kcms/spellchecking/spellchecking.desktop kcms/style/CMakeLists.txt kcms/style/Messages.sh kcms/style/kcm_style.desktop kcms/style/package/contents/ui/main.qml kcms/style/package/metadata.desktop kcms/touchpad/src/kcm/kcm_touchpad.desktop kcms/touchpad/src/kded/kcm_touchpad.notifyrc kcms/touchpad/src/kded/kded_touchpad.desktop kcms/workspaceoptions/kcm_workspace.desktop kcms/workspaceoptions/package/contents/ui/main.qml kcms/workspaceoptions/package/metadata.desktop kcms/workspaceoptions/workspaceoptions_kdeglobalssettings.kcfg kcms/workspaceoptions/workspaceoptions_kdeglobalssettings.kcfgc layout-templates/org.kde.plasma.desktop.defaultPanel/metadata.desktop org.kde.plasmashell.metainfo.xml runners/plasma-desktop/plasma-runner-plasma-desktop.desktop solid-device-automounter/kcm/device_automounter_kcm.desktop solid-device-automounter/kded/device_automounter.desktop toolboxes/desktoptoolbox/metadata.desktop toolboxes/paneltoolbox/metadata.desktop toolboxes/plasma-toolbox-paneltoolbox.desktop To: leinir, mart, ngraham Cc: 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
