diff --git a/kcms/mouse/CMakeLists.txt b/kcms/mouse/CMakeLists.txt --- a/kcms/mouse/CMakeLists.txt +++ b/kcms/mouse/CMakeLists.txt @@ -75,7 +75,6 @@ KF5::I18n KF5::KIOCore KF5::KIOWidgets - KF5::KDELibs4Support KF5::Declarative Qt5::DBus diff --git a/kcms/mouse/kcm/xlib/xlib_config.cpp b/kcms/mouse/kcm/xlib/xlib_config.cpp --- a/kcms/mouse/kcm/xlib/xlib_config.cpp +++ b/kcms/mouse/kcm/xlib/xlib_config.cpp @@ -30,13 +30,11 @@ #include "../../../migrationlib/kdelibs4config.h" -#include #include #include #include //#include -#include #include #include #include @@ -47,6 +45,7 @@ #include #include #include +#include #include #include @@ -151,11 +150,11 @@ leftHanded->setChecked(false); if (val == Handed::Right) { rightHanded->setChecked(true); - mousePix->setPixmap(KStandardDirs::locate("data", "kcmmouse/pics/mouse_rh.png")); + mousePix->setPixmap(QStandardPaths::locate(QStandardPaths::GenericDataLocation, "kcmmouse/pics/mouse_rh.png")); } else { leftHanded->setChecked(true); - mousePix->setPixmap(KStandardDirs::locate("data", "kcmmouse/pics/mouse_lh.png")); + mousePix->setPixmap(QStandardPaths::locate(QStandardPaths::GenericDataLocation, "kcmmouse/pics/mouse_lh.png")); } m_backend->settings()->handedNeedsApply = true; } @@ -292,9 +291,9 @@ void XlibConfig::slotHandedChanged(int val) { if (val == static_cast(Handed::Right)) - mousePix->setPixmap(KStandardDirs::locate("data", "kcmmouse/pics/mouse_rh.png")); + mousePix->setPixmap(QStandardPaths::locate(QStandardPaths::GenericDataLocation, "kcmmouse/pics/mouse_rh.png")); else - mousePix->setPixmap(KStandardDirs::locate("data", "kcmmouse/pics/mouse_lh.png")); + mousePix->setPixmap(QStandardPaths::locate(QStandardPaths::GenericDataLocation, "kcmmouse/pics/mouse_lh.png")); m_backend->settings()->handedNeedsApply = true; }