ngraham updated this revision to Diff 33452. ngraham added a comment.
- Merge master - Remove custom styling REPOSITORY R241 KIO CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D12333?vs=32522&id=33452 BRANCH move-sort-order-chooser-to-toolbar (branched from master) REVISION DETAIL https://phabricator.kde.org/D12333 AFFECTED FILES autotests/kfileplacesviewtest.cpp src/core/batchrenamejob.h src/core/connectionserver.h src/core/copyjob.h src/core/dataslave_p.h src/core/deletejob.h src/core/directorysizejob.h src/core/emptytrashjob.h src/core/filecopyjob.h src/core/filesystemfreespacejob.h src/core/forwardingslavebase.h src/core/hostinfo.cpp src/core/kcoredirlister.cpp src/core/kcoredirlister.h src/core/krecentdocument.cpp src/core/listjob.h src/core/mimetypejob.h src/core/mkdirjob.h src/core/mkpathjob.cpp src/core/mkpathjob.h src/core/multigetjob.h src/core/restorejob.h src/core/scheduler.cpp src/core/simplejob.h src/core/statjob.h src/core/tcpslavebase.h src/core/transferjob.h src/filewidgets/kdiroperator.cpp src/filewidgets/kdirsortfilterproxymodel.h src/filewidgets/kfilebookmarkhandler_p.h src/filewidgets/kfilecopytomenu.h src/filewidgets/kfilecustomdialog.h src/filewidgets/kfilefiltercombo.h src/filewidgets/kfileplacesmodel.cpp src/filewidgets/kfileplacesmodel.h src/filewidgets/kfileplacesview.cpp src/filewidgets/kfileplacesview.h src/filewidgets/kfilepreviewgenerator.cpp src/filewidgets/kfilewidget.cpp src/filewidgets/kfilewidget.h src/filewidgets/kimagefilepreview.h src/filewidgets/kpreviewwidgetbase.h src/filewidgets/kurlnavigator.cpp src/filewidgets/kurlnavigator.h src/filewidgets/kurlnavigatorbutton.cpp src/filewidgets/kurlnavigatordropdownbutton_p.h src/filewidgets/kurlnavigatormenu_p.h src/filewidgets/kurlnavigatorplacesselector_p.h src/filewidgets/kurlnavigatortogglebutton_p.h src/ioslaves/file/file_unix.cpp src/ioslaves/file/kauth/file.actions src/ioslaves/trash/kcmtrash.desktop src/pathhelpers_p.h src/urifilters/ikws/searchproviders/qt.desktop src/urifilters/ikws/searchproviders/qt4.desktop src/widgets/kpropertiesdialog.cpp To: ngraham, #frameworks, #dolphin, #vdg Cc: abetts, jtamate, broulik, anemeth, rkflx, michaelh, bruns
