kde-plugins: install them where our qtbase expects them

starting a plasma session caused gazillions of | kf5.kded: Could not load kded module "statusnotifierwatcher":"The shared library was not found." (library path was:"statusnotifierwatcher") | kf5.kded: Could not load kded module "kscreen":"The shared library was not found." (library path was:"kscreen") | kf5.kded: Could not load kded module "ksysguard":"Plugin verification data mismatch in '/usr/bin/ksysguard'" (library path was:"ksysguard") | kf5.kded: Could not load kded module "powerdevil":"The shared library was not found." (library path was:"powerdevil") | kf5.kded: Could not load kded module "networkmanagement":"The shared library was not found." (library path was:"networkmanagement") | kf5.kded: Could not load kded module "kded_baloosearch_kio":"The shared library was not found." (library path was:"kded_baloosearch_kio") Now it takes much longer for kcrash to complain and it has window decorations - partytime has not yet come.. Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
2015-04-30 17:19:31 +02:00
parent 6e7a1a0f87
commit 7fab900fa9
30 changed files with 111 additions and 65 deletions
--- a/classes/kde-base.bbclass
+++ b/classes/kde-base.bbclass
@@ -16,5 +16,6 @@ EXTRA_OECMAKE += " \
    -DECM_MKSPECS_INSTALL_DIR=${libdir}/${QT_DIR_NAME}/mkspecs/modules \
    -DCMAKE_INSTALL_DATADIR=share \
    -DCMAKE_INSTALL_DBUSINTERFACEDIR=share/dbus-1/interfaces \
+    -DKDE_INSTALL_QTPLUGINDIR=${libdir}/${QT_DIR_NAME}/plugins \
 "
 FILES_${PN}-dev += "${libdir}/${QT_DIR_NAME}/mkspecs"
--- a/recipes-kde/apps/filelight/filelight.bb
+++ b/recipes-kde/apps/filelight/filelight.bb
@@ -28,9 +28,9 @@ SRC_URI += " \
 FILES_${PN} += " \
    ${datadir}/k*5 \
    ${datadir}/icons \
-    ${libdir}/plugins \
+    ${libdir}/${QT_DIR_NAME}/plugins \
 "

 FILES_${PN}-dbg += " \
-    ${libdir}/plugins/.debug \
+    ${libdir}/${QT_DIR_NAME}/plugins/.debug \
 "
--- a/recipes-kde/apps/kate/kate.bb
+++ b/recipes-kde/apps/kate/kate.bb
@@ -49,10 +49,10 @@ FILES_${PN} += " \
    ${datadir}/appdata \
    \
    ${libdir}/libkdeinit5*.so \
-    ${libdir}/plugins \
+    ${libdir}/${QT_DIR_NAME}/plugins \
 "

 FILES_${PN}-dbg += " \
-    ${libdir}/plugins/*/.debug \
-    ${libdir}/plugins/*/*/.debug \
+    ${libdir}/${QT_DIR_NAME}/plugins/*/.debug \
+    ${libdir}/${QT_DIR_NAME}/plugins/*/*/.debug \
 "
--- a/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.bb
+++ b/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.bb
@@ -43,13 +43,13 @@ CMAKE_ALIGN_SYSROOT[2] = "KDELibs4, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
 CMAKE_ALIGN_SYSROOT[3] = "KF5KDELibs4Support, -S${bindir}, -S${STAGING_BINDIR_NATIVE}"

 FILES_${PN} += " \
-	${datadir}/k*5 \
-	${datadir}/dbus-1 \
-	${libdir}/plugins \
+    ${datadir}/k*5 \
+    ${datadir}/dbus-1 \
+    ${libdir}/${QT_DIR_NAME}/plugins \
 "

 FILES_${PN}-dbg += " \
-	${libdir}/plugins/.debug \
-	${libdir}/plugins/kf5/*/.debug \
-	${libdir}/plugins/*/.debug \
+    ${libdir}/${QT_DIR_NAME}/plugins/.debug \
+    ${libdir}/${QT_DIR_NAME}/plugins/kf5/*/.debug \
+    ${libdir}/${QT_DIR_NAME}/plugins/*/.debug \
 "
--- a/recipes-kde/kf5/porting-aids-tier3/kross/kross.bb
+++ b/recipes-kde/kf5/porting-aids-tier3/kross/kross.bb
@@ -27,10 +27,10 @@ CMAKE_ALIGN_SYSROOT[1] = "KF5Kross, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
 CMAKE_ALIGN_SYSROOT[2] = "KF5Kross, -S${includedir}, -S${STAGING_INCDIR}"

 FILES_${PN} += " \
-    ${libdir}/plugins \
+    ${libdir}/${QT_DIR_NAME}/plugins \
 "

 FILES_${PN}-dbg += " \
-    ${libdir}/plugins/.debug \
-    ${libdir}/plugins/*/.debug \
+    ${libdir}/${QT_DIR_NAME}/plugins/.debug \
+    ${libdir}/${QT_DIR_NAME}/plugins/*/.debug \
 "
--- a/recipes-kde/kf5/tier1/ki18n/ki18n.bb
+++ b/recipes-kde/kf5/tier1/ki18n/ki18n.bb
@@ -8,3 +8,6 @@ CMAKE_ALIGN_SYSROOT[2] = "KF5I18n, -S${includedir}, -S${STAGING_INCDIR}"
 # revisit python?

 DEPENDS += "${BPN}-native qtscript"
+
+FILES_${PN} += "${libdir}/${QT_DIR_NAME}/plugins/kf5"
+FILES_${PN}-dbg += "${libdir}/${QT_DIR_NAME}/plugins/kf5/.debug"
--- a/recipes-kde/kf5/tier1/kimageformats/kimageformats.bb
+++ b/recipes-kde/kf5/tier1/kimageformats/kimageformats.bb
@@ -12,5 +12,8 @@ PV = "${KF5_VERSION}"
 SRC_URI[md5sum] = "f5c9f709a11753baeabdf1b7a2cb0c16"
 SRC_URI[sha256sum] = "afae002076702bd4b5509a4cea43161d409bda6b2de6797023d9f90bc3cc9984"

-FILES_${PN} += "${libdir}/plugins ${datadir}/kservices5"
-FILES_${PN}-dbg += "${libdir}/plugins/*/.debug"
+FILES_${PN} += " \
+    ${libdir}/${QT_DIR_NAME}/plugins \
+    ${datadir}/kservices5 \
+"
+FILES_${PN}-dbg += "${libdir}/${QT_DIR_NAME}/plugins/*/.debug"
--- a/recipes-kde/kf5/tier2/kauth/kauth.bb
+++ b/recipes-kde/kf5/tier2/kauth/kauth.bb
@@ -13,5 +13,5 @@ CMAKE_ALIGN_SYSROOT[2] = "KF5Auth, -S${includedir}, -S${STAGING_INCDIR}"
 # executables
 CMAKE_ALIGN_SYSROOT[3] = "KF5Auth, -S${libexecdir}/kauth-policy-gen, -S${STAGING_LIBDIR_NATIVE}/${BPN}/kauth-policy-gen"

-FILES_${PN} += "${libdir}/plugins"
-FILES_${PN}-dbg += "${libdir}/plugins/*/*/.debug"
+FILES_${PN} += "${libdir}/${QT_DIR_NAME}/plugins"
+FILES_${PN}-dbg += "${libdir}/${QT_DIR_NAME}/plugins/*/*/.debug"
--- a/recipes-kde/kf5/tier3/kactivities/kactivities.bb
+++ b/recipes-kde/kf5/tier3/kactivities/kactivities.bb
@@ -18,5 +18,13 @@ SRC_URI += "file://0001-replace-try_run-by-try_compile-in-compiler-feature-c.pat
 CMAKE_ALIGN_SYSROOT[1] = "KF5Activities, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
 CMAKE_ALIGN_SYSROOT[2] = "KF5Activities, -S${includedir}, -S${STAGING_INCDIR}"

-FILES_${PN} += "${datadir}/k*5 ${libdir}/plugins ${libdir}/qml/org/kde"
-FILES_${PN}-dbg += "${libdir}/plugins/.debug ${libdir}/plugins/*/.debug ${libdir}/qml/org/kde/*/.debug"
+FILES_${PN} += " \
+    ${datadir}/k*5 \
+    ${libdir}/${QT_DIR_NAME}/plugins \
+    ${libdir}/qml/org/kde \
+"
+FILES_${PN}-dbg += " \
+    ${libdir}/${QT_DIR_NAME}/plugins/.debug \
+    ${libdir}/${QT_DIR_NAME}/plugins/*/.debug \
+    ${libdir}/qml/org/kde/*/.debug \
+"
--- a/recipes-kde/kf5/tier3/kemoticons/kemoticons.bb
+++ b/recipes-kde/kf5/tier3/kemoticons/kemoticons.bb
@@ -17,5 +17,12 @@ SRC_URI[sha256sum] = "500a816ebecd98bf55f838e8a22ebf9345470943d7544cbdd228e072ea
 CMAKE_ALIGN_SYSROOT[1] = "KF5Emoticons, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
 CMAKE_ALIGN_SYSROOT[2] = "KF5Emoticons, -S${includedir}, -S${STAGING_INCDIR}"

-FILES_${PN} += "${datadir}/emoticons ${datadir}/k*5"
-FILES_${PN}-dbg += "${libdir}/plugins/kf5/*/.debug"
+FILES_${PN} += " \
+    ${datadir}/emoticons \
+    ${datadir}/k*5 \
+    ${libdir}/${QT_DIR_NAME}/plugins \
+"
+FILES_${PN}-dbg += " \
+    ${libdir}/${QT_DIR_NAME}/plugins/kf5/.debug \
+    ${libdir}/${QT_DIR_NAME}/plugins/kf5/*/.debug \
+"
--- a/recipes-kde/kf5/tier3/kio/kio.bb
+++ b/recipes-kde/kf5/tier3/kio/kio.bb
@@ -34,5 +34,14 @@ PACKAGECONFIG ??= "full"
 CMAKE_ALIGN_SYSROOT[1] = "KF5KIO, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
 CMAKE_ALIGN_SYSROOT[2] = "KF5KIO, -S${includedir}, -S${STAGING_INCDIR}"

-FILES_${PN} += "${datadir}/dbus-1 ${datadir}/k*5 ${libdir}/plugins"
-FILES_${PN}-dbg += "${libdir}/plugins/.debug ${libdir}/${BPN}/kf5/.debug ${libdir}/plugins/kf5/*/.debug"
+FILES_${PN} += " \
+    ${datadir}/dbus-1 \
+    ${datadir}/k*5 \
+    ${libdir}/${QT_DIR_NAME}/plugins \
+"
+FILES_${PN}-dbg += " \
+    ${libdir}/${BPN}/kf5/.debug \
+    ${libdir}/${QT_DIR_NAME}/plugins/.debug \
+    ${libdir}/${QT_DIR_NAME}/plugins/*/.debug \
+    ${libdir}/${QT_DIR_NAME}/plugins/*/*/.debug \
+"
--- a/recipes-kde/kf5/tier3/kparts/kparts.bb
+++ b/recipes-kde/kf5/tier3/kparts/kparts.bb
@@ -28,5 +28,8 @@ SRC_URI[sha256sum] = "54bcb5059ee1cbcb287d0c5f7d8660849574978a9678417118be6a2481
 CMAKE_ALIGN_SYSROOT[1] = "KF5Parts, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
 CMAKE_ALIGN_SYSROOT[2] = "KF5Parts, -S${includedir}, -S${STAGING_INCDIR}"

-FILES_${PN} += "${datadir}/k*5 ${libdir}/plugins"
-FILES_${PN}-dbg += "${libdir}/plugins/.debug"
+FILES_${PN} += " \
+    ${datadir}/k*5 \
+    ${libdir}/${QT_DIR_NAME}/plugins \
+"
+FILES_${PN}-dbg += "${libdir}/${QT_DIR_NAME}/plugins/.debug"
--- a/recipes-kde/kf5/tier3/ktexteditor/ktexteditor.bb
+++ b/recipes-kde/kf5/tier3/ktexteditor/ktexteditor.bb
@@ -8,5 +8,10 @@ DEPENDS += "${BPN}-native qtxmlpatterns"
 CMAKE_ALIGN_SYSROOT[1] = "KF5TextEditor, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
 CMAKE_ALIGN_SYSROOT[2] = "KF5TextEditor, -S${includedir}, -S${STAGING_INCDIR}"

-FILES_${PN} += "${datadir}/k*5"
-FILES_${PN}-dbg += "${libdir}/plugins/kf5/parts/.debug"
+FILES_${PN} += " \
+    ${datadir}/k*5 \
+    ${libdir}/${QT_DIR_NAME}/plugins \
+"
+FILES_${PN}-dbg += " \
+    ${libdir}/${QT_DIR_NAME}/plugins/kf5/parts/.debug \
+"
--- a/recipes-kde/kf5/tier3/plasma-framework/plasma-framework.bb
+++ b/recipes-kde/kf5/tier3/plasma-framework/plasma-framework.bb
@@ -43,15 +43,15 @@ FILES_${PN} += " \
    ${datadir}/dbus-1 \
    ${datadir}/plasma \
    \
-    ${libdir}/plugins \
+    ${libdir}/${QT_DIR_NAME}/plugins \
    ${libdir}/platformqml \
    ${libdir}/qml \
    ${libdir}/org/kde/plasma \
 "

 FILES_${PN}-dbg += " \
-    ${libdir}/plugins/.debug \
-    ${libdir}/plugins/kf5/*/.debug \
+    ${libdir}/${QT_DIR_NAME}/plugins/.debug \
+    ${libdir}/${QT_DIR_NAME}/plugins/kf5/*/.debug \
    ${libdir}/platformqml/*/org/kde/plasma/*/.debug \
    ${libdir}/org/kde/plasma/*/.debug \
    ${libdir}/qml/org/kde/plasma/*/.debug \
--- a/recipes-kde/kf5/tier4/frameworkintegration/frameworkintegration.bb
+++ b/recipes-kde/kf5/tier4/frameworkintegration/frameworkintegration.bb
@@ -28,9 +28,9 @@ CMAKE_ALIGN_SYSROOT[2] = "KF5FrameworkIntegration, -S${includedir}, -S${STAGING_

 FILES_${PN} += " \
    ${datadir}/knotifications5 \
-    ${libdir}/plugins \
+    ${libdir}/${QT_DIR_NAME}/plugins \
 "

 FILES_${PN}-dbg += " \
-    ${libdir}/plugins/*/.debug \
+    ${libdir}/${QT_DIR_NAME}/plugins/*/.debug \
 "
--- a/recipes-kde/plasma/tier2/kfilemetadata/kfilemetadata.bb
+++ b/recipes-kde/plasma/tier2/kfilemetadata/kfilemetadata.bb
@@ -23,4 +23,8 @@ DEPENDS += "taglib"
 CMAKE_ALIGN_SYSROOT[1] = "KF5FileMetaData, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
 CMAKE_ALIGN_SYSROOT[2] = "KF5FileMetaData, -S${includedir}, -S${STAGING_INCDIR}"

-FILES_${PN}-dbg += "${libdir}/plugins/kf5/kfilemetadata/.debug"
+FILES_${PN} += "${libdir}/${QT_DIR_NAME}/plugins/kf5"
+FILES_${PN}-dbg += " \
+    ${libdir}/${QT_DIR_NAME}/plugins/kf5/.debug \
+    ${libdir}/${QT_DIR_NAME}/plugins/kf5/*/.debug \
+"
--- a/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb
+++ b/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb
@@ -61,13 +61,13 @@ CMAKE_ALIGN_SYSROOT[4] = "LibTaskManager, -S${includedir}, -S${STAGING_INCDIR}"
 FILES_${PN} += " \
    ${datadir} \
    ${libdir}/libkdeinit5*.so \
-    ${libdir}/plugins \
+    ${libdir}/${QT_DIR_NAME}/plugins \
    ${libdir}/qml \
 "
 FILES_${PN}-dbg += " \
-    ${libdir}/plugins/.debug \
-    ${libdir}/plugins/*/.debug \
-    ${libdir}/plugins/*/*/.debug \
+    ${libdir}/${QT_DIR_NAME}/plugins/.debug \
+    ${libdir}/${QT_DIR_NAME}/plugins/*/.debug \
+    ${libdir}/${QT_DIR_NAME}/plugins/*/*/.debug \
    ${libdir}/qml/org/kde/*/*/.debug \
    ${libdir}/qml/org/kde/*/*/*/.debug \
 "
--- a/recipes-kde/plasma/untier/breeze/breeze.bb
+++ b/recipes-kde/plasma/untier/breeze/breeze.bb
@@ -33,7 +33,7 @@ FILES_${PN} += " \
    ${datadir}/QtCurve \
    ${datadir}/wallpapers \
    \
-    ${libdir}/plugins \
+    ${libdir}/${QT_DIR_NAME}/plugins \
    ${libdir}/qml \
    ${libdir}/kconf_update_bin \
 "
@@ -41,4 +41,5 @@ FILES_${PN} += " \
 FILES_${PN}-dbg += " \
    ${libdir}/*/.debug \
    ${libdir}/*/*/.debug \
+    ${libdir}/${QT_DIR_NAME}/plugins/*/.debug \
 "
--- a/recipes-kde/plasma/untier/kde-cli-tools/kde-cli-tools.bb
+++ b/recipes-kde/plasma/untier/kde-cli-tools/kde-cli-tools.bb
@@ -29,11 +29,12 @@ FILES_SOLIBSDEV = ""

 FILES_${PN} += " \
    ${datadir}/kservices5 \
-    ${libdir}/plugins \
+    ${libdir}/${QT_DIR_NAME}/plugins \
    ${libdir}/libkdeinit5_kcmshell5.so \
 "

 FILES_${PN}-dbg += " \
    ${libdir}/*/.debug \
    ${libdir}/${BPN}/*/.debug \
+    ${libdir}/${QT_DIR_NAME}/plugins/.debug \
 "
--- a/recipes-kde/plasma/untier/kde-gtk-config/kde-gtk-config.bb
+++ b/recipes-kde/plasma/untier/kde-gtk-config/kde-gtk-config.bb
@@ -28,9 +28,9 @@ FILES_${PN} += " \
    ${datadir}/kservices5 \
    ${datadir}/kcm-gtk-module \
    ${datadir}/icons \
-    ${libdir}/plugins \
+    ${libdir}/${QT_DIR_NAME}/plugins \
 "

 FILES_${PN}-dbg += " \
-    ${libdir}/plugins/.debug \
+    ${libdir}/${QT_DIR_NAME}/plugins/.debug \
 "
--- a/recipes-kde/plasma/untier/kdeplasma-addons/kdeplasma-addons.bb
+++ b/recipes-kde/plasma/untier/kdeplasma-addons/kdeplasma-addons.bb
@@ -39,12 +39,12 @@ FILES_${PN} += " \
    ${datadir}/plasma \
    ${datadir}/icons \
    \
-    ${libdir}/plugins \
+    ${libdir}/${QT_DIR_NAME}/plugins \
    ${libdir}/qml \
 "

 FILES_${PN}-dbg += " \
-    ${libdir}/plugins/.debug \
-    ${libdir}/plugins/*/*/.debug \
+    ${libdir}/${QT_DIR_NAME}/plugins/.debug \
+    ${libdir}/${QT_DIR_NAME}/plugins/*/*/.debug \
    ${libdir}/qml/org/kde/plasma/private/*/.debug \
 "
--- a/recipes-kde/plasma/untier/khotkeys/khotkeys.bb
+++ b/recipes-kde/plasma/untier/khotkeys/khotkeys.bb
@@ -30,9 +30,9 @@ SRC_URI[sha256sum] = "443510037bdd51b177efa273bfb34c8c3d40d293944bec420fab0b7acc
 FILES_${PN} += " \
    ${datadir}/kservices5 \
    ${datadir}/dbus-1 \
-    ${libdir}/plugins \
+    ${libdir}/${QT_DIR_NAME}/plugins \
 "

 FILES_${PN}-dbg += " \
-    ${libdir}/plugins/.debug \
+    ${libdir}/${QT_DIR_NAME}/plugins/.debug \
 "
--- a/recipes-kde/plasma/untier/kinfocenter/kinfocenter.bb
+++ b/recipes-kde/plasma/untier/kinfocenter/kinfocenter.bb
@@ -45,10 +45,10 @@ FILES_${PN} += " \
    ${datadir}/k*5 \
    ${datadir}/kpackage \
    \
-    ${libdir}/plugins \
+    ${libdir}/${QT_DIR_NAME}/plugins \
 "

 FILES_${PN}-dbg += " \
-    ${libdir}/plugins/.debug \
-    ${libdir}/plugins/*/.debug \
+    ${libdir}/${QT_DIR_NAME}/plugins/.debug \
+    ${libdir}/${QT_DIR_NAME}/plugins/*/.debug \
 "
--- a/recipes-kde/plasma/untier/kscreen/kscreen.bb
+++ b/recipes-kde/plasma/untier/kscreen/kscreen.bb
@@ -28,9 +28,9 @@ FILES_${PN} += " \
    ${datadir}/kcm_kscreen \
    ${datadir}/kservices5 \
    ${datadir}/icons \
-    ${libdir}/plugins \
+    ${libdir}/${QT_DIR_NAME}/plugins \
 "

 FILES_${PN}-dbg += " \
-    ${libdir}/plugins/.debug \
+    ${libdir}/${QT_DIR_NAME}/plugins/.debug \
 "
--- a/recipes-kde/plasma/untier/milou/milou.bb
+++ b/recipes-kde/plasma/untier/milou/milou.bb
@@ -25,11 +25,11 @@ SRC_URI[sha256sum] = "5857081b91a6537d110608901b4eac4b0e8aa627f608a8b4d243f1c86f
 FILES_${PN} += " \
    ${datadir}/k*5 \
    ${datadir}/plasma \
-    ${libdir}/plugins \
+    ${libdir}/${QT_DIR_NAME}/plugins \
    ${libdir}/qml \
 "

 FILES_${PN}-dbg += " \
-    ${libdir}/plugins/.debug \
+    ${libdir}/${QT_DIR_NAME}/plugins/.debug \
    ${libdir}/qml/*/*/*/.debug \
 "
--- a/recipes-kde/plasma/untier/muon/muon.bb
+++ b/recipes-kde/plasma/untier/muon/muon.bb
@@ -43,11 +43,11 @@ FILES_${PN} += " \
    \
    ${libdir}/libMuonCommon.so \
    ${libdir}/libMuonNotifiers.so \
-    ${libdir}/plugins \
+    ${libdir}/${QT_DIR_NAME}/plugins \
    ${libdir}/qml \
 "

 FILES_${PN}-dbg += " \
-    ${libdir}/plugins/*/.debug \
+    ${libdir}/${QT_DIR_NAME}/plugins/*/.debug \
    ${libdir}/qml/org/kde/*/.debug \
 "
--- a/recipes-kde/plasma/untier/oxygen/oxygen.bb
+++ b/recipes-kde/plasma/untier/oxygen/oxygen.bb
@@ -29,10 +29,10 @@ FILES_${PN} += " \
    ${datadir}/kservices5 \
    ${datadir}/kstyle \
    ${datadir}/plasma \
-    ${libdir}/plugins \
+    ${libdir}/${QT_DIR_NAME}/plugins \
 "

 FILES_${PN}-dbg += " \
-    ${libdir}/plugins/.debug \
-    ${libdir}/plugins/*/.debug \
+    ${libdir}/${QT_DIR_NAME}/plugins/.debug \
+    ${libdir}/${QT_DIR_NAME}/plugins/*/.debug \
 "
--- a/recipes-kde/plasma/untier/plasma-desktop/plasma-desktop.bb
+++ b/recipes-kde/plasma/untier/plasma-desktop/plasma-desktop.bb
@@ -62,13 +62,14 @@ FILES_${PN} += " \
    ${libdir}/libkdeinit5_kaccess.so \
    ${libdir}/qml \
    ${libdir}/kauth \
-    ${libdir}/plugins \
+    ${libdir}/${QT_DIR_NAME}/plugins \
    ${libdir}/kconf_update_bin \
 "

 FILES_${PN}-dbg += " \
    ${libdir}/*/.debug \
-    ${libdir}/plugins/*/.debug \
+    ${libdir}/${QT_DIR_NAME}/plugins/.debug \
+    ${libdir}/${QT_DIR_NAME}/plugins/*/.debug \
    ${libdir}/qml/org/kde/*/*/.debug \
    ${libdir}/qml/org/kde/*/*/*/.debug \
 "
--- a/recipes-kde/plasma/untier/powerdevil/powerdevil.bb
+++ b/recipes-kde/plasma/untier/powerdevil/powerdevil.bb
@@ -30,11 +30,11 @@ FILES_${PN} += " \
    ${datadir}/k*5 \
    ${datadir}/dbus-1 \
    ${datadir}/polkit-1 \
-    ${libdir}/plugins \
+    ${libdir}/${QT_DIR_NAME}/plugins \
    ${libdir}/kauth \
 "

 FILES_${PN}-dbg += " \
-    ${libdir}/plugins/.debug \
+    ${libdir}/${QT_DIR_NAME}/plugins/.debug \
    ${libdir}/kauth/.debug \
 "
--- a/recipes-kde/plasma/untier/sddm-kcm/sddm-kcm.bb
+++ b/recipes-kde/plasma/untier/sddm-kcm/sddm-kcm.bb
@@ -26,11 +26,11 @@ FILES_${PN} += " \
    ${datadir}/kservices5 \
    ${datadir}/dbus-1 \
    ${datadir}/polkit-1 \
-    ${libdir}/plugins \
+    ${libdir}/${QT_DIR_NAME}/plugins \
    ${libdir}/kauth \
 "

 FILES_${PN}-dbg += " \
-    ${libdir}/plugins/.debug \
+    ${libdir}/${QT_DIR_NAME}/plugins/.debug \
    ${libdir}/kauth/.debug \
 "