Merge branch 'Plasma/5.16'
0d3375f5c4a5
Actions

Authored by atulbi on May 18 2019, 4:40 PM.

Description

Merge branch 'Plasma/5.16'

Committed

atulbi

May 18 2019, 4:40 PM

Differential Revision

D21269: [Touchpad KCM] Fixed loading of wrong qml file

Parents

Branches

Unknown

Tags

Unknown

	Commit			Author	Details	Committed
	aeca2f1f7133			atulbi	Revert project version	May 18 2019
	3e0fd10ddc27		D21269	atulbi	[Touchpad KCM] Fixed loading of wrong qml file	May 18 2019

				Path	Packages
	M			kcms/touchpad/src/backends/x11/libinputtouchpad.cpp
	V			kcms/touchpad/src/kcm/libinput/{main.qml → touchpad.qml}
	V			kcms/touchpad/src/kcm/libinput/{touchpad.qml ← main.qml}
	M			kcms/touchpad/src/kcm/libinput/touchpadconfiglibinput.cpp
	M			kcms/touchpad/src/kcm/resources.qrc