diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ project(plasma-desktop) -set(PROJECT_VERSION "5.15.90") +set(PROJECT_VERSION "5.16.80") set(PROJECT_VERSION_MAJOR 5) set(QT_MIN_VERSION "5.11.0") diff --git a/kcms/touchpad/src/backends/x11/libinputtouchpad.cpp b/kcms/touchpad/src/backends/x11/libinputtouchpad.cpp --- a/kcms/touchpad/src/backends/x11/libinputtouchpad.cpp +++ b/kcms/touchpad/src/backends/x11/libinputtouchpad.cpp @@ -29,29 +29,6 @@ #include -static const QSet configProps = { - QStringLiteral("enabled"), - QStringLiteral("disableWhileTyping"), - QStringLiteral("disableEventsOnExternalMouse"), - QStringLiteral("leftHanded"), - QStringLiteral("middleEmulation"), - QStringLiteral("pointerAcceleration"), - QStringLiteral("pointerAccelerationProfileFlat"), - QStringLiteral("pointerAccelerationProfileAdaptive"), - QStringLiteral("tapToClick"), - QStringLiteral("tapAndDrag"), - QStringLiteral("tapDragLock"), - QStringLiteral("lrmTapButtonMap"), - QStringLiteral("lmrTapButtonMap"), - QStringLiteral("scrollTwoFinger"), - QStringLiteral("scrollOnButtonDown"), - QStringLiteral("scrollButton"), - QStringLiteral("scrollEdge"), - QStringLiteral("naturalScroll"), - QStringLiteral("horizontalScrolling"), - QStringLiteral("clickMethodAreas"), - QStringLiteral("clickMethodClickfinger") -}; const Parameter libinputProperties[] = { diff --git a/kcms/touchpad/src/kcm/libinput/main.qml b/kcms/touchpad/src/kcm/libinput/touchpad.qml rename from kcms/touchpad/src/kcm/libinput/main.qml rename to kcms/touchpad/src/kcm/libinput/touchpad.qml diff --git a/kcms/touchpad/src/kcm/libinput/touchpadconfiglibinput.cpp b/kcms/touchpad/src/kcm/libinput/touchpadconfiglibinput.cpp --- a/kcms/touchpad/src/kcm/libinput/touchpadconfiglibinput.cpp +++ b/kcms/touchpad/src/kcm/libinput/touchpadconfiglibinput.cpp @@ -77,7 +77,7 @@ KDeclarative::KDeclarative kdeclarative; kdeclarative.setDeclarativeEngine(m_view->engine()); kdeclarative.setupBindings(); - m_view->setSource(QUrl("qrc:/libinput/main.qml")); + m_view->setSource(QUrl("qrc:/libinput/touchpad.qml")); if (m_initError) { m_errorMessage->setMessageType(KMessageWidget::Error); diff --git a/kcms/touchpad/src/kcm/resources.qrc b/kcms/touchpad/src/kcm/resources.qrc --- a/kcms/touchpad/src/kcm/resources.qrc +++ b/kcms/touchpad/src/kcm/resources.qrc @@ -1,5 +1,5 @@ - libinput/main.qml + libinput/touchpad.qml