diff --git a/classes/kde-base.bbclass b/classes/kde-base.bbclass
index a6243a23..e9f1115c 100644
--- a/classes/kde-base.bbclass
+++ b/classes/kde-base.bbclass
@@ -16,6 +16,7 @@ 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 \
+    -DKDE_INSTALL_QTPLUGINDIR=${OE_QMAKE_PATH_PLUGINS} \
+    -DKDE_INSTALL_QMLDIR=${OE_QMAKE_PATH_QML} \
 "
 FILES_${PN}-dev += "${libdir}/${QT_DIR_NAME}/mkspecs"
diff --git a/recipes-kde/apps/libkdegames/libkdegames.bb b/recipes-kde/apps/libkdegames/libkdegames.bb
index 40423c5a..d906a512 100644
--- a/recipes-kde/apps/libkdegames/libkdegames.bb
+++ b/recipes-kde/apps/libkdegames/libkdegames.bb
@@ -50,11 +50,11 @@ PACKAGECONFIG ??= ""
 FILES_${PN} += " \
     ${datadir}/carddecks \
     ${datadir}/kconf_update \
-    ${libdir}/qml \
+    ${libdir}/${QT_DIR_NAME}/qml \
 "
 
 FILES_${PN}-dbg += " \
-    ${libdir}/qml/*/*/*/*/.debug \
+    ${libdir}/${QT_DIR_NAME}/qml/*/*/*/*/.debug \
 "
 
 CMAKE_ALIGN_SYSROOT[1] = "KF5KDEGames, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
diff --git a/recipes-kde/kf5/porting-aids-tier3/krunner/krunner.bb b/recipes-kde/kf5/porting-aids-tier3/krunner/krunner.bb
index cffcfde9..e858e369 100644
--- a/recipes-kde/kf5/porting-aids-tier3/krunner/krunner.bb
+++ b/recipes-kde/kf5/porting-aids-tier3/krunner/krunner.bb
@@ -15,5 +15,8 @@ SRC_URI[sha256sum] = "b4313d849ebffc61db54bee113014e62921677422e0a41c84d75d72c46
 CMAKE_ALIGN_SYSROOT[1] = "KF5Runner, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
 CMAKE_ALIGN_SYSROOT[2] = "KF5Runner, -S${includedir}, -S${STAGING_INCDIR}"
 
-FILES_${PN} += "${datadir}/k*5 ${libdir}/qml/org/kde"
-FILES_${PN}-dbg += "${libdir}/qml/org/kde/*/.debug"
+FILES_${PN} += " \
+    ${datadir}/k*5 \
+    ${libdir}/${QT_DIR_NAME}/qml/org/kde \
+"
+FILES_${PN}-dbg += "${libdir}/${QT_DIR_NAME}/qml/org/kde/*/.debug"
diff --git a/recipes-kde/kf5/tier1/solid/solid.bb b/recipes-kde/kf5/tier1/solid/solid.bb
index f00d92db..250db638 100644
--- a/recipes-kde/kf5/tier1/solid/solid.bb
+++ b/recipes-kde/kf5/tier1/solid/solid.bb
@@ -15,5 +15,7 @@ SRC_URI[sha256sum] = "96e38e4aa1c3bbc77557dd608552e2d1dc78b7300f7c2a62846ebd43af
 CMAKE_ALIGN_SYSROOT[1] = "KF5Solid, -S${libdir}, -S${STAGING_LIBDIR}"
 CMAKE_ALIGN_SYSROOT[2] = "KF5Solid, -S${includedir}, -S${STAGING_INCDIR}"
 
-FILES_${PN} += "${libdir}/qml"
-FILES_${PN}-dbg += "${libdir}/qml/org/kde/${BPN}/.debug"
+FILES_${PN} += "${libdir}/${QT_DIR_NAME}/qml"
+FILES_${PN}-dbg += "${libdir}/${QT_DIR_NAME}/qml/org/kde/${BPN}/.debug"
+
+RRECOMMENDS_${PN} += "udisks2"
diff --git a/recipes-kde/kf5/tier3/kactivities/kactivities.bb b/recipes-kde/kf5/tier3/kactivities/kactivities.bb
index 706972d7..1287db91 100644
--- a/recipes-kde/kf5/tier3/kactivities/kactivities.bb
+++ b/recipes-kde/kf5/tier3/kactivities/kactivities.bb
@@ -21,10 +21,10 @@ CMAKE_ALIGN_SYSROOT[2] = "KF5Activities, -S${includedir}, -S${STAGING_INCDIR}"
 FILES_${PN} += " \
     ${datadir}/k*5 \
     ${libdir}/${QT_DIR_NAME}/plugins \
-    ${libdir}/qml/org/kde \
+    ${libdir}/${QT_DIR_NAME}/qml/org/kde \
 "
 FILES_${PN}-dbg += " \
     ${libdir}/${QT_DIR_NAME}/plugins/.debug \
     ${libdir}/${QT_DIR_NAME}/plugins/*/.debug \
-    ${libdir}/qml/org/kde/*/.debug \
+    ${libdir}/${QT_DIR_NAME}/qml/org/kde/*/.debug \
 "
diff --git a/recipes-kde/kf5/tier3/kdeclarative/kdeclarative.bb b/recipes-kde/kf5/tier3/kdeclarative/kdeclarative.bb
index 7891e92b..c09c2e46 100644
--- a/recipes-kde/kf5/tier3/kdeclarative/kdeclarative.bb
+++ b/recipes-kde/kf5/tier3/kdeclarative/kdeclarative.bb
@@ -17,5 +17,8 @@ SRC_URI[sha256sum] = "84b15fb7092d963841fd70d1f603ca4a704e0284154368fc2fef80c04b
 CMAKE_ALIGN_SYSROOT[1] = "KF5Declarative, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
 CMAKE_ALIGN_SYSROOT[2] = "KF5Declarative, -S${includedir}, -S${STAGING_INCDIR}"
 
-FILES_${PN} += "${libdir}/qml/org/kde"
-FILES_${PN}-dbg += "${libdir}/qml/org/kde/*/.debug ${libdir}/qml/org/kde/*/*/.debug"
+FILES_${PN} += "${libdir}/${QT_DIR_NAME}/qml/org/kde"
+FILES_${PN}-dbg += " \
+    ${libdir}/${QT_DIR_NAME}/qml/org/kde/*/.debug \
+    ${libdir}/${QT_DIR_NAME}/qml/org/kde/*/*/.debug \
+"
diff --git a/recipes-kde/kf5/tier3/kpeople/kpeople.bb b/recipes-kde/kf5/tier3/kpeople/kpeople.bb
index bae58504..9415df42 100644
--- a/recipes-kde/kf5/tier3/kpeople/kpeople.bb
+++ b/recipes-kde/kf5/tier3/kpeople/kpeople.bb
@@ -18,6 +18,6 @@ CMAKE_ALIGN_SYSROOT[2] = "KF5People, -S${includedir}, -S${STAGING_INCDIR}"
 
 FILES_${PN} += " \
     ${datadir}/k*5 \
-    ${libdir}/qml \
+    ${libdir}/${QT_DIR_NAME}/qml \
 "
-FILES_${PN}-dbg += "${libdir}/qml/*/*/*/.debug"
+FILES_${PN}-dbg += "${libdir}/${QT_DIR_NAME}/qml/*/*/*/.debug"
diff --git a/recipes-kde/kf5/tier3/plasma-framework/plasma-framework.bb b/recipes-kde/kf5/tier3/plasma-framework/plasma-framework.bb
index 55719c29..cdb3daa9 100644
--- a/recipes-kde/kf5/tier3/plasma-framework/plasma-framework.bb
+++ b/recipes-kde/kf5/tier3/plasma-framework/plasma-framework.bb
@@ -45,7 +45,7 @@ FILES_${PN} += " \
     \
     ${libdir}/${QT_DIR_NAME}/plugins \
     ${libdir}/platformqml \
-    ${libdir}/qml \
+    ${libdir}/${QT_DIR_NAME}/qml \
     ${libdir}/org/kde/plasma \
 "
 
@@ -54,5 +54,5 @@ FILES_${PN}-dbg += " \
     ${libdir}/${QT_DIR_NAME}/plugins/kf5/*/.debug \
     ${libdir}/platformqml/*/org/kde/plasma/*/.debug \
     ${libdir}/org/kde/plasma/*/.debug \
-    ${libdir}/qml/org/kde/plasma/*/.debug \
+    ${libdir}/${QT_DIR_NAME}/qml/org/kde/plasma/*/.debug \
 "
diff --git a/recipes-kde/plasma/tier3/baloo/baloo.bb b/recipes-kde/plasma/tier3/baloo/baloo.bb
index 53c93da2..beef6063 100644
--- a/recipes-kde/plasma/tier3/baloo/baloo.bb
+++ b/recipes-kde/plasma/tier3/baloo/baloo.bb
@@ -20,14 +20,14 @@ CMAKE_ALIGN_SYSROOT[1] = "KF5Baloo, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
 CMAKE_ALIGN_SYSROOT[2] = "KF5Baloo, -S${includedir}, -S${STAGING_INCDIR}"
 
 FILES_${PN} += "${datadir} \
-    ${libdir}/qml/org/kde/baloo \
-    ${libdir}/${QT_DIR_NAME}/plugins \
     ${libdir}/kauth \
+    ${libdir}/${QT_DIR_NAME}/qml/org/kde/baloo \
+    ${libdir}/${QT_DIR_NAME}/plugins \
 "
 
 FILES_${PN}-dbg += " \
-	${libdir}/qml/org/kde/baloo/.debug \
 	${libdir}/*/.debug \
+	${libdir}/${QT_DIR_NAME}/qml/org/kde/baloo/.debug \
 	${libdir}/${QT_DIR_NAME}/plugins/.debug \
 	${libdir}/${QT_DIR_NAME}/plugins/kf5/*/.debug \
 "
diff --git a/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb b/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb
index 6e91bb1f..08634003 100644
--- a/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb
+++ b/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb
@@ -62,14 +62,14 @@ FILES_${PN} += " \
     ${datadir} \
     ${libdir}/libkdeinit5*.so \
     ${libdir}/${QT_DIR_NAME}/plugins \
-    ${libdir}/qml \
+    ${libdir}/${QT_DIR_NAME}/qml \
 "
 FILES_${PN}-dbg += " \
     ${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 \
+    ${libdir}/${QT_DIR_NAME}/qml/org/kde/*/*/.debug \
+    ${libdir}/${QT_DIR_NAME}/qml/org/kde/*/*/*/.debug \
 "
 
 FILES_${PN}-dev = " \
diff --git a/recipes-kde/plasma/untier/breeze/breeze.bb b/recipes-kde/plasma/untier/breeze/breeze.bb
index babe9717..3b133512 100644
--- a/recipes-kde/plasma/untier/breeze/breeze.bb
+++ b/recipes-kde/plasma/untier/breeze/breeze.bb
@@ -35,7 +35,7 @@ FILES_${PN} += " \
     ${datadir}/wallpapers \
     \
     ${libdir}/${QT_DIR_NAME}/plugins \
-    ${libdir}/qml \
+    ${libdir}/${QT_DIR_NAME}/qml \
     ${libdir}/kconf_update_bin \
 "
 
diff --git a/recipes-kde/plasma/untier/kdeplasma-addons/kdeplasma-addons.bb b/recipes-kde/plasma/untier/kdeplasma-addons/kdeplasma-addons.bb
index 03c9df25..2cdcd722 100644
--- a/recipes-kde/plasma/untier/kdeplasma-addons/kdeplasma-addons.bb
+++ b/recipes-kde/plasma/untier/kdeplasma-addons/kdeplasma-addons.bb
@@ -40,11 +40,11 @@ FILES_${PN} += " \
     ${datadir}/icons \
     \
     ${libdir}/${QT_DIR_NAME}/plugins \
-    ${libdir}/qml \
+    ${libdir}/${QT_DIR_NAME}/qml \
 "
 
 FILES_${PN}-dbg += " \
     ${libdir}/${QT_DIR_NAME}/plugins/.debug \
     ${libdir}/${QT_DIR_NAME}/plugins/*/*/.debug \
-    ${libdir}/qml/org/kde/plasma/private/*/.debug \
+    ${libdir}/${QT_DIR_NAME}/qml/org/kde/plasma/private/*/.debug \
 "
diff --git a/recipes-kde/plasma/untier/kwin/kwin.bb b/recipes-kde/plasma/untier/kwin/kwin.bb
index 04e47ec2..506f4a0e 100644
--- a/recipes-kde/plasma/untier/kwin/kwin.bb
+++ b/recipes-kde/plasma/untier/kwin/kwin.bb
@@ -67,7 +67,7 @@ FILES_${PN} += " \
     ${datadir}/icons \
     ${datadir}/*5 \
     ${libdir}/${QT_DIR_NAME}/plugins \
-    ${libdir}/qml \
+    ${libdir}/${QT_DIR_NAME}/qml \
     ${libdir}/kconf_update_bin \
 "
 
@@ -86,4 +86,5 @@ FILES_${PN}-dbg += " \
     ${libdir}/*/*/*/*/.debug \
     ${libdir}/*/*/*/*/*/.debug \
     ${libdir}/*/*/*/*/*/*/.debug \
+    ${libdir}/*/*/*/*/*/*/*/.debug \
 "
diff --git a/recipes-kde/plasma/untier/milou/milou.bb b/recipes-kde/plasma/untier/milou/milou.bb
index 043582e2..478c7eff 100644
--- a/recipes-kde/plasma/untier/milou/milou.bb
+++ b/recipes-kde/plasma/untier/milou/milou.bb
@@ -26,10 +26,10 @@ FILES_${PN} += " \
     ${datadir}/k*5 \
     ${datadir}/plasma \
     ${libdir}/${QT_DIR_NAME}/plugins \
-    ${libdir}/qml \
+    ${libdir}/${QT_DIR_NAME}/qml \
 "
 
 FILES_${PN}-dbg += " \
     ${libdir}/${QT_DIR_NAME}/plugins/.debug \
-    ${libdir}/qml/*/*/*/.debug \
+    ${libdir}/${QT_DIR_NAME}/qml/*/*/*/.debug \
 "
diff --git a/recipes-kde/plasma/untier/muon/muon.bb b/recipes-kde/plasma/untier/muon/muon.bb
index f9ec6363..aec5063c 100644
--- a/recipes-kde/plasma/untier/muon/muon.bb
+++ b/recipes-kde/plasma/untier/muon/muon.bb
@@ -44,10 +44,10 @@ FILES_${PN} += " \
     ${libdir}/libMuonCommon.so \
     ${libdir}/libMuonNotifiers.so \
     ${libdir}/${QT_DIR_NAME}/plugins \
-    ${libdir}/qml \
+    ${libdir}/${QT_DIR_NAME}/qml \
 "
 
 FILES_${PN}-dbg += " \
     ${libdir}/${QT_DIR_NAME}/plugins/*/.debug \
-    ${libdir}/qml/org/kde/*/.debug \
+    ${libdir}/${QT_DIR_NAME}/qml/org/kde/*/.debug \
 "
diff --git a/recipes-kde/plasma/untier/plasma-desktop/plasma-desktop.bb b/recipes-kde/plasma/untier/plasma-desktop/plasma-desktop.bb
index d307b294..5474f4a8 100644
--- a/recipes-kde/plasma/untier/plasma-desktop/plasma-desktop.bb
+++ b/recipes-kde/plasma/untier/plasma-desktop/plasma-desktop.bb
@@ -60,7 +60,7 @@ FILES_${PN} += " \
     ${datadir}/solid \
     \
     ${libdir}/libkdeinit5_kaccess.so \
-    ${libdir}/qml \
+    ${libdir}/${QT_DIR_NAME}/qml \
     ${libdir}/kauth \
     ${libdir}/${QT_DIR_NAME}/plugins \
     ${libdir}/kconf_update_bin \
@@ -70,6 +70,6 @@ FILES_${PN}-dbg += " \
     ${libdir}/*/.debug \
     ${libdir}/${QT_DIR_NAME}/plugins/.debug \
     ${libdir}/${QT_DIR_NAME}/plugins/*/.debug \
-    ${libdir}/qml/org/kde/*/*/.debug \
-    ${libdir}/qml/org/kde/*/*/*/.debug \
+    ${libdir}/${QT_DIR_NAME}/qml/org/kde/*/*/.debug \
+    ${libdir}/${QT_DIR_NAME}/qml/org/kde/*/*/*/.debug \
 "
diff --git a/recipes-kde/plasma/untier/plasma-nm/plasma-nm.bb b/recipes-kde/plasma/untier/plasma-nm/plasma-nm.bb
index 4b8af7a4..34bdfae8 100644
--- a/recipes-kde/plasma/untier/plasma-nm/plasma-nm.bb
+++ b/recipes-kde/plasma/untier/plasma-nm/plasma-nm.bb
@@ -50,11 +50,11 @@ FILES_${PN} += " \
     ${datadir}/k*5 \
     ${datadir}/plasma \
     ${libdir}/${QT_DIR_NAME}/plugins \
-    ${libdir}/qml \
+    ${libdir}/${QT_DIR_NAME}/qml \
     ${libdir}/*.so \
 "
 
 FILES_${PN}-dbg += " \
     ${libdir}/${QT_DIR_NAME}/plugins/.debug \
-    ${libdir}/qml/*/*/*/*/.debug \
+    ${libdir}/${QT_DIR_NAME}/qml/*/*/*/*/.debug \
 "