Commit 3e0fd10d authored by Atul bisht's avatar Atul bisht

[Touchpad KCM] Fixed loading of wrong qml file

Summary:
On system settings, If Mouse KCM is opened first, then touchpad KCM loads the same Mouse QML file (qrc:/libinput/main.qml) instead of Touchpad Qml file.
Having same url (qrc:/libinput/main.qml).

Fix: simply renaming qml files fixed the issue.There could be better solutions though.

Also removed unused configProps from D21228.

BUG: 398228

Test Plan:
1. Renamed main.qml to touchpad.qml .
2. Edited resource file to reflect change.
3. When compiled with these changes and opened touchpad setting, it was all blank, which was expected (because i did not changed the source).But opening mouse and then
touchpad shows mouse settigs. So it Confirmed the cause.
4. Now changing source and compiling it fixes the issue. Now, no more mouse on Touchpad and vice-versa.

Reviewers: romangg, ngraham

Reviewed By: romangg

Subscribers: plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D21269
parent 5afc24db
......@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.0)
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")
......
......@@ -29,29 +29,6 @@
#include <X11/extensions/XInput2.h>
static const QSet<QString> 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[] = {
......
......@@ -77,7 +77,7 @@ TouchpadConfigLibinput::TouchpadConfigLibinput(TouchpadConfigContainer *parent,
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);
......
<RCC>
<qresource prefix="/">
<file>libinput/main.qml</file>
<file>libinput/touchpad.qml</file>
</qresource>
</RCC>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment