mart updated this revision to Diff 20005. mart added a comment.
- Merge branch 'master' into mart/colorcontext - add a rangeslider to the gallery - some comments REPOSITORY R169 Kirigami CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D7939?vs=19797&id=20005 BRANCH mart/colorcontext REVISION DETAIL https://phabricator.kde.org/D7939 AFFECTED FILES CMakeLists.txt KF5Kirigami2Config.cmake.in KF5Kirigami2Macros.cmake autotests/tst_keynavigation.qml autotests/tst_listskeynavigation.qml autotests/tst_pagerow.qml examples/applicationitemapp/main.qml examples/galleryapp/CMakeLists.txt examples/galleryapp/resources.qrc examples/gallerydata/contents/ui/DesktopExampleApp.qml examples/gallerydata/contents/ui/ExampleApp.qml examples/gallerydata/contents/ui/MainPage.qml examples/gallerydata/contents/ui/gallery/ButtonGallery.qml examples/gallerydata/contents/ui/gallery/CheckBoxGallery.qml examples/gallerydata/contents/ui/gallery/ColorSetGallery.qml examples/gallerydata/contents/ui/gallery/ColorsGallery.qml examples/gallerydata/contents/ui/gallery/LayersGallery.qml examples/gallerydata/contents/ui/gallery/ListViewGallery.qml examples/gallerydata/contents/ui/gallery/ListViewHeaderItemsGallery.qml examples/gallerydata/contents/ui/gallery/MetricsGallery.qml examples/gallerydata/contents/ui/gallery/MiscGallery.qml examples/gallerydata/contents/ui/gallery/MultipleColumnsGallery.qml examples/gallerydata/contents/ui/gallery/NonScrollableGallery.qml examples/gallerydata/contents/ui/gallery/ProgressBarGallery.qml examples/gallerydata/contents/ui/gallery/RadioButtonGallery.qml examples/gallerydata/contents/ui/gallery/SliderGallery.qml examples/gallerydata/contents/ui/gallery/SwitchGallery.qml examples/gallerydata/contents/ui/gallery/TabBarGallery.qml examples/gallerydata/contents/ui/gallery/TextFieldGallery.qml examples/minimalqmake/Page1Form.ui.qml examples/minimalqmake/kirigami-icons.qrc examples/minimalqmake/main.qml examples/simpleexamples/AbstractApplicationWindow.qml examples/simpleexamples/FixedSidebar.qml examples/simpleexamples/MultipleColumnsGallery.qml examples/simpleexamples/SplitDrawer.qml examples/simpleexamples/TabBarHeader.qml examples/simpleexamples/customdrawer.qml examples/simpleexamples/minimal.qml examples/simpleexamples/pushpopclear.qml examples/simpleexamples/simpleChatApp.qml src/CMakeLists.txt src/controls/AbstractApplicationHeader.qml src/controls/AbstractApplicationItem.qml src/controls/AbstractApplicationWindow.qml src/controls/AbstractApplicationWindow.qmlc src/controls/AbstractItemViewHeader.qml src/controls/ApplicationItem.qml src/controls/ApplicationWindow.qml src/controls/BasicListItem.qml src/controls/ContextDrawer.qml src/controls/GlobalDrawer.qml src/controls/Heading.qml src/controls/Icon.qml src/controls/ItemViewHeader.qml src/controls/Label.qml src/controls/OverlayDrawer.qml src/controls/OverlaySheet.qml src/controls/Page.qml src/controls/PageRow.qml src/controls/ScrollablePage.qml src/controls/Separator.qml src/controls/Theme.qml src/controls/ToolBarApplicationHeader.qml src/controls/Units.qml src/controls/plugins.qmltypes src/controls/private/ActionButton.qml src/controls/private/CornerShadow.qml src/controls/private/DefaultListItemBackground.qml src/controls/private/EdgeShadow.qml src/controls/private/PrivateActionToolButton.qml src/controls/private/RefreshableScrollView.qml src/controls/private/SwipeItemEventFilter.qml src/controls/templates/AbstractApplicationHeader.qml src/controls/templates/AbstractListItem.qml src/controls/templates/ApplicationHeader.qml src/controls/templates/OverlayDrawer.qml src/controls/templates/OverlaySheet.qml src/controls/templates/SwipeListItem.qml src/controls/templates/private/BackButton.qml src/controls/templates/private/ContextIcon.qml src/controls/templates/private/MenuIcon.qml src/controls/templates/private/PassiveNotification.qml src/controls/templates/private/ScrollView.qml src/desktopicon.cpp src/desktopicon.h src/kirigamiplugin.cpp src/libkirigami/CMakeLists.txt src/libkirigami/basictheme.cpp src/libkirigami/basictheme_p.h src/libkirigami/platformtheme.cpp src/libkirigami/platformtheme.h src/libkirigami/platformthemefactory.cpp src/libkirigami/platformthemefactory.h src/styles/Material/AbstractListItem.qml src/styles/Material/Label.qml src/styles/Material/SwipeListItem.qml src/styles/Material/Theme.qml src/styles/Plasma/Icon.qml src/styles/Plasma/Theme.qml src/styles/org.kde.desktop/AbstractApplicationHeader.qml src/styles/org.kde.desktop/AbstractListItem.qml src/styles/org.kde.desktop/ApplicationWindow.qml src/styles/org.kde.desktop/OverlayDrawer.qml src/styles/org.kde.desktop/SwipeListItem.qml src/styles/org.kde.desktop/Theme.qml tests/KeyboardListTest.qml tests/KeyboardTest.qml To: mart, #kirigami, hein Cc: plasma-devel, apol, davidedmundson, mart, hein