diff --git a/recipes-kde/apps/filelight/filelight.bb b/recipes-kde/apps/filelight/filelight.bb
index ede052ff..678fd5e0 100644
--- 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}/${QT_DIR_NAME}/plugins \
+    ${OE_QMAKE_PATH_PLUGINS} \
 "
 
 FILES_${PN}-dbg += " \
-    ${libdir}/${QT_DIR_NAME}/plugins/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/.debug \
 "
diff --git a/recipes-kde/apps/kate/kate.bb b/recipes-kde/apps/kate/kate.bb
index 071b4697..8df3232a 100644
--- 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}/${QT_DIR_NAME}/plugins \
+    ${OE_QMAKE_PATH_PLUGINS} \
 "
 
 FILES_${PN}-dbg += " \
-    ${libdir}/${QT_DIR_NAME}/plugins/*/.debug \
-    ${libdir}/${QT_DIR_NAME}/plugins/*/*/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/*/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/*/*/.debug \
 "
diff --git a/recipes-kde/apps/konsole/konsole.bb b/recipes-kde/apps/konsole/konsole.bb
index 177736a6..41b8836a 100644
--- a/recipes-kde/apps/konsole/konsole.bb
+++ b/recipes-kde/apps/konsole/konsole.bb
@@ -46,10 +46,10 @@ FILES_SOLIBSDEV = ""
 FILES_${PN} += " \
     ${datadir}/k*5 \
     ${datadir}/appdata \
-    ${libdir}/${QT_DIR_NAME}/plugins \
+    ${OE_QMAKE_PATH_PLUGINS} \
     ${libdir}/libkdeinit5_konsole.so \
 "
 
 FILES_${PN}-dbg += " \
-    ${libdir}/${QT_DIR_NAME}/plugins/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/.debug \
 "
diff --git a/recipes-kde/apps/libkdegames/libkdegames.bb b/recipes-kde/apps/libkdegames/libkdegames.bb
index d906a512..ead90c11 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}/${QT_DIR_NAME}/qml \
+    ${OE_QMAKE_PATH_QML} \
 "
 
 FILES_${PN}-dbg += " \
-    ${libdir}/${QT_DIR_NAME}/qml/*/*/*/*/.debug \
+    ${OE_QMAKE_PATH_QML}/*/*/*/*/.debug \
 "
 
 CMAKE_ALIGN_SYSROOT[1] = "KF5KDEGames, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
diff --git a/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.bb b/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.bb
index fd543666..6dc54b74 100644
--- a/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.bb
+++ b/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.bb
@@ -45,11 +45,11 @@ CMAKE_ALIGN_SYSROOT[3] = "KF5KDELibs4Support, -S${bindir}, -S${STAGING_BINDIR_NA
 FILES_${PN} += " \
     ${datadir}/k*5 \
     ${datadir}/dbus-1 \
-    ${libdir}/${QT_DIR_NAME}/plugins \
+    ${OE_QMAKE_PATH_PLUGINS} \
 "
 
 FILES_${PN}-dbg += " \
-    ${libdir}/${QT_DIR_NAME}/plugins/.debug \
-    ${libdir}/${QT_DIR_NAME}/plugins/kf5/*/.debug \
-    ${libdir}/${QT_DIR_NAME}/plugins/*/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/kf5/*/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/*/.debug \
 "
diff --git a/recipes-kde/kf5/porting-aids-tier3/khtml/khtml.bb b/recipes-kde/kf5/porting-aids-tier3/khtml/khtml.bb
index a8055860..b81f6261 100644
--- a/recipes-kde/kf5/porting-aids-tier3/khtml/khtml.bb
+++ b/recipes-kde/kf5/porting-aids-tier3/khtml/khtml.bb
@@ -40,9 +40,9 @@ CMAKE_ALIGN_SYSROOT[2] = "KF5KHtml, -S${includedir}, -S${STAGING_INCDIR}"
 
 FILES_${PN} += " \
     ${datadir}/k*5 \
-    ${libdir}/${QT_DIR_NAME}/plugins \
+    ${OE_QMAKE_PATH_PLUGINS} \
 "
 
 FILES_${PN}-dbg += " \
-    ${libdir}/${QT_DIR_NAME}/plugins/kf5/*/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/kf5/*/.debug \
 "
diff --git a/recipes-kde/kf5/porting-aids-tier3/kross/kross.bb b/recipes-kde/kf5/porting-aids-tier3/kross/kross.bb
index b3dcc185..effea4cd 100644
--- 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}/${QT_DIR_NAME}/plugins \
+    ${OE_QMAKE_PATH_PLUGINS} \
 "
 
 FILES_${PN}-dbg += " \
-    ${libdir}/${QT_DIR_NAME}/plugins/.debug \
-    ${libdir}/${QT_DIR_NAME}/plugins/*/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/*/.debug \
 "
diff --git a/recipes-kde/kf5/porting-aids-tier3/krunner/krunner.bb b/recipes-kde/kf5/porting-aids-tier3/krunner/krunner.bb
index 57466245..2f13902c 100644
--- a/recipes-kde/kf5/porting-aids-tier3/krunner/krunner.bb
+++ b/recipes-kde/kf5/porting-aids-tier3/krunner/krunner.bb
@@ -17,6 +17,6 @@ CMAKE_ALIGN_SYSROOT[2] = "KF5Runner, -S${includedir}, -S${STAGING_INCDIR}"
 
 FILES_${PN} += " \
     ${datadir}/k*5 \
-    ${libdir}/${QT_DIR_NAME}/qml/org/kde \
+    ${OE_QMAKE_PATH_QML}/org/kde \
 "
-FILES_${PN}-dbg += "${libdir}/${QT_DIR_NAME}/qml/org/kde/*/.debug"
+FILES_${PN}-dbg += "${OE_QMAKE_PATH_QML}/org/kde/*/.debug"
diff --git a/recipes-kde/kf5/tier1/ki18n/ki18n.bb b/recipes-kde/kf5/tier1/ki18n/ki18n.bb
index 97b97e9b..6338dd53 100644
--- a/recipes-kde/kf5/tier1/ki18n/ki18n.bb
+++ b/recipes-kde/kf5/tier1/ki18n/ki18n.bb
@@ -9,5 +9,5 @@ CMAKE_ALIGN_SYSROOT[2] = "KF5I18n, -S${includedir}, -S${STAGING_INCDIR}"
 
 DEPENDS += "${BPN}-native qtscript"
 
-FILES_${PN} += "${libdir}/${QT_DIR_NAME}/plugins/kf5"
-FILES_${PN}-dbg += "${libdir}/${QT_DIR_NAME}/plugins/kf5/.debug"
+FILES_${PN} += "${OE_QMAKE_PATH_PLUGINS}/kf5"
+FILES_${PN}-dbg += "${OE_QMAKE_PATH_PLUGINS}/kf5/.debug"
diff --git a/recipes-kde/kf5/tier1/kimageformats/kimageformats.bb b/recipes-kde/kf5/tier1/kimageformats/kimageformats.bb
index a03a5233..09ac9f7e 100644
--- a/recipes-kde/kf5/tier1/kimageformats/kimageformats.bb
+++ b/recipes-kde/kf5/tier1/kimageformats/kimageformats.bb
@@ -13,7 +13,7 @@ SRC_URI[md5sum] = "ebae895f7e81640d183407810c9f04a4"
 SRC_URI[sha256sum] = "61daa87b4c8cc7c7aede6d0cb5f94f336b1a2a149f037d4947ad80ac0a13f159"
 
 FILES_${PN} += " \
-    ${libdir}/${QT_DIR_NAME}/plugins \
+    ${OE_QMAKE_PATH_PLUGINS} \
     ${datadir}/kservices5 \
 "
-FILES_${PN}-dbg += "${libdir}/${QT_DIR_NAME}/plugins/*/.debug"
+FILES_${PN}-dbg += "${OE_QMAKE_PATH_PLUGINS}/*/.debug"
diff --git a/recipes-kde/kf5/tier1/solid/solid.bb b/recipes-kde/kf5/tier1/solid/solid.bb
index 248e37e9..219ebc4e 100644
--- a/recipes-kde/kf5/tier1/solid/solid.bb
+++ b/recipes-kde/kf5/tier1/solid/solid.bb
@@ -15,7 +15,7 @@ SRC_URI[sha256sum] = "c7a8832fb7f34584e23d08d7dfdf44a7270a2cba8244ef4d609bfbe2c9
 CMAKE_ALIGN_SYSROOT[1] = "KF5Solid, -S${libdir}, -S${STAGING_LIBDIR}"
 CMAKE_ALIGN_SYSROOT[2] = "KF5Solid, -S${includedir}, -S${STAGING_INCDIR}"
 
-FILES_${PN} += "${libdir}/${QT_DIR_NAME}/qml"
-FILES_${PN}-dbg += "${libdir}/${QT_DIR_NAME}/qml/org/kde/${BPN}/.debug"
+FILES_${PN} += "${OE_QMAKE_PATH_QML}"
+FILES_${PN}-dbg += "${OE_QMAKE_PATH_QML}/org/kde/${BPN}/.debug"
 
 RRECOMMENDS_${PN} += "udisks2"
diff --git a/recipes-kde/kf5/tier2/kauth/kauth.bb b/recipes-kde/kf5/tier2/kauth/kauth.bb
index a2c99ea3..b4f2cafe 100644
--- 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}/${QT_DIR_NAME}/plugins"
-FILES_${PN}-dbg += "${libdir}/${QT_DIR_NAME}/plugins/*/*/.debug"
+FILES_${PN} += "${OE_QMAKE_PATH_PLUGINS}"
+FILES_${PN}-dbg += "${OE_QMAKE_PATH_PLUGINS}/*/*/.debug"
diff --git a/recipes-kde/kf5/tier3/kactivities/kactivities.bb b/recipes-kde/kf5/tier3/kactivities/kactivities.bb
index 69a6811d..b1549e60 100644
--- a/recipes-kde/kf5/tier3/kactivities/kactivities.bb
+++ b/recipes-kde/kf5/tier3/kactivities/kactivities.bb
@@ -20,11 +20,11 @@ CMAKE_ALIGN_SYSROOT[2] = "KF5Activities, -S${includedir}, -S${STAGING_INCDIR}"
 
 FILES_${PN} += " \
     ${datadir}/k*5 \
-    ${libdir}/${QT_DIR_NAME}/plugins \
-    ${libdir}/${QT_DIR_NAME}/qml/org/kde \
+    ${OE_QMAKE_PATH_PLUGINS} \
+    ${OE_QMAKE_PATH_QML}/org/kde \
 "
 FILES_${PN}-dbg += " \
-    ${libdir}/${QT_DIR_NAME}/plugins/.debug \
-    ${libdir}/${QT_DIR_NAME}/plugins/*/.debug \
-    ${libdir}/${QT_DIR_NAME}/qml/org/kde/*/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/*/.debug \
+    ${OE_QMAKE_PATH_QML}/org/kde/*/.debug \
 "
diff --git a/recipes-kde/kf5/tier3/kdeclarative/kdeclarative.bb b/recipes-kde/kf5/tier3/kdeclarative/kdeclarative.bb
index e603938c..3bccca2b 100644
--- a/recipes-kde/kf5/tier3/kdeclarative/kdeclarative.bb
+++ b/recipes-kde/kf5/tier3/kdeclarative/kdeclarative.bb
@@ -17,8 +17,8 @@ SRC_URI[sha256sum] = "d93148c3284d85b31cc79378ba52bbc38aad2a7364a93ecaaf2206b277
 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}/${QT_DIR_NAME}/qml/org/kde"
+FILES_${PN} += "${OE_QMAKE_PATH_QML}/org/kde"
 FILES_${PN}-dbg += " \
-    ${libdir}/${QT_DIR_NAME}/qml/org/kde/*/.debug \
-    ${libdir}/${QT_DIR_NAME}/qml/org/kde/*/*/.debug \
+    ${OE_QMAKE_PATH_QML}/org/kde/*/.debug \
+    ${OE_QMAKE_PATH_QML}/org/kde/*/*/.debug \
 "
diff --git a/recipes-kde/kf5/tier3/kemoticons/kemoticons.bb b/recipes-kde/kf5/tier3/kemoticons/kemoticons.bb
index bade633b..f32fcf5b 100644
--- a/recipes-kde/kf5/tier3/kemoticons/kemoticons.bb
+++ b/recipes-kde/kf5/tier3/kemoticons/kemoticons.bb
@@ -20,9 +20,9 @@ CMAKE_ALIGN_SYSROOT[2] = "KF5Emoticons, -S${includedir}, -S${STAGING_INCDIR}"
 FILES_${PN} += " \
     ${datadir}/emoticons \
     ${datadir}/k*5 \
-    ${libdir}/${QT_DIR_NAME}/plugins \
+    ${OE_QMAKE_PATH_PLUGINS} \
 "
 FILES_${PN}-dbg += " \
-    ${libdir}/${QT_DIR_NAME}/plugins/kf5/.debug \
-    ${libdir}/${QT_DIR_NAME}/plugins/kf5/*/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/kf5/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/kf5/*/.debug \
 "
diff --git a/recipes-kde/kf5/tier3/kio/kio.bb b/recipes-kde/kf5/tier3/kio/kio.bb
index 2f38af3c..fd1b7444 100644
--- a/recipes-kde/kf5/tier3/kio/kio.bb
+++ b/recipes-kde/kf5/tier3/kio/kio.bb
@@ -37,11 +37,11 @@ CMAKE_ALIGN_SYSROOT[2] = "KF5KIO, -S${includedir}, -S${STAGING_INCDIR}"
 FILES_${PN} += " \
     ${datadir}/dbus-1 \
     ${datadir}/k*5 \
-    ${libdir}/${QT_DIR_NAME}/plugins \
+    ${OE_QMAKE_PATH_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 \
+    ${OE_QMAKE_PATH_PLUGINS}/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/*/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/*/*/.debug \
 "
diff --git a/recipes-kde/kf5/tier3/kparts/kparts.bb b/recipes-kde/kf5/tier3/kparts/kparts.bb
index 33d3677c..ce60d199 100644
--- a/recipes-kde/kf5/tier3/kparts/kparts.bb
+++ b/recipes-kde/kf5/tier3/kparts/kparts.bb
@@ -30,6 +30,6 @@ CMAKE_ALIGN_SYSROOT[2] = "KF5Parts, -S${includedir}, -S${STAGING_INCDIR}"
 
 FILES_${PN} += " \
     ${datadir}/k*5 \
-    ${libdir}/${QT_DIR_NAME}/plugins \
+    ${OE_QMAKE_PATH_PLUGINS} \
 "
-FILES_${PN}-dbg += "${libdir}/${QT_DIR_NAME}/plugins/.debug"
+FILES_${PN}-dbg += "${OE_QMAKE_PATH_PLUGINS}/.debug"
diff --git a/recipes-kde/kf5/tier3/kpeople/kpeople.bb b/recipes-kde/kf5/tier3/kpeople/kpeople.bb
index 1098c059..2da92880 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}/${QT_DIR_NAME}/qml \
+    ${OE_QMAKE_PATH_QML} \
 "
-FILES_${PN}-dbg += "${libdir}/${QT_DIR_NAME}/qml/*/*/*/.debug"
+FILES_${PN}-dbg += "${OE_QMAKE_PATH_QML}/*/*/*/.debug"
diff --git a/recipes-kde/kf5/tier3/ktexteditor/ktexteditor.bb b/recipes-kde/kf5/tier3/ktexteditor/ktexteditor.bb
index f2880f6c..b9be1360 100644
--- a/recipes-kde/kf5/tier3/ktexteditor/ktexteditor.bb
+++ b/recipes-kde/kf5/tier3/ktexteditor/ktexteditor.bb
@@ -10,8 +10,8 @@ CMAKE_ALIGN_SYSROOT[2] = "KF5TextEditor, -S${includedir}, -S${STAGING_INCDIR}"
 
 FILES_${PN} += " \
     ${datadir}/k*5 \
-    ${libdir}/${QT_DIR_NAME}/plugins \
+    ${OE_QMAKE_PATH_PLUGINS} \
 "
 FILES_${PN}-dbg += " \
-    ${libdir}/${QT_DIR_NAME}/plugins/kf5/parts/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/kf5/parts/.debug \
 "
diff --git a/recipes-kde/kf5/tier4/frameworkintegration/frameworkintegration.bb b/recipes-kde/kf5/tier4/frameworkintegration/frameworkintegration.bb
index 3d81485a..d2e577b1 100644
--- 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}/${QT_DIR_NAME}/plugins \
+    ${OE_QMAKE_PATH_PLUGINS} \
 "
 
 FILES_${PN}-dbg += " \
-    ${libdir}/${QT_DIR_NAME}/plugins/*/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/*/.debug \
 "
diff --git a/recipes-kde/other/phonon/phonon_4.8.3.bb b/recipes-kde/other/phonon/phonon_4.8.3.bb
index b8a875dd..fba5489e 100644
--- a/recipes-kde/other/phonon/phonon_4.8.3.bb
+++ b/recipes-kde/other/phonon/phonon_4.8.3.bb
@@ -31,8 +31,8 @@ CMAKE_ALIGN_SYSROOT[1] = "phonon4qt5, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
 CMAKE_ALIGN_SYSROOT[2] = "phonon4qt5, -S${includedir}, -S${STAGING_INCDIR}"
 
 PACKAGES =+ "${PN}-designer-plugin-dbg ${PN}-designer-plugin"
-FILES_${PN}-designer-plugin = "${libdir}/qt5/plugins/designer"
-FILES_${PN}-designer-plugin-dbg = "${libdir}/qt5/plugins/designer/.debug"
+FILES_${PN}-designer-plugin = "${OE_QMAKE_PATH_PLUGINS}/designer"
+FILES_${PN}-designer-plugin-dbg = "${OE_QMAKE_PATH_PLUGINS}/designer/.debug"
 
 FILES_${PN} += "${datadir}/dbus-1"
 FILES_${PN}-dev += "${datadir}/${QT_DIR_NAME}/mkspecs ${datadir}/phonon4qt5/buildsystem"
diff --git a/recipes-kde/plasma/tier2/kfilemetadata/kfilemetadata.bb b/recipes-kde/plasma/tier2/kfilemetadata/kfilemetadata.bb
index d0c30b7a..d99503c8 100644
--- a/recipes-kde/plasma/tier2/kfilemetadata/kfilemetadata.bb
+++ b/recipes-kde/plasma/tier2/kfilemetadata/kfilemetadata.bb
@@ -23,8 +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} += "${libdir}/${QT_DIR_NAME}/plugins/kf5"
+FILES_${PN} += "${OE_QMAKE_PATH_PLUGINS}/kf5"
 FILES_${PN}-dbg += " \
-    ${libdir}/${QT_DIR_NAME}/plugins/kf5/.debug \
-    ${libdir}/${QT_DIR_NAME}/plugins/kf5/*/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/kf5/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/kf5/*/.debug \
 "
diff --git a/recipes-kde/plasma/tier3/baloo/baloo.bb b/recipes-kde/plasma/tier3/baloo/baloo.bb
index beef6063..35690d0f 100644
--- a/recipes-kde/plasma/tier3/baloo/baloo.bb
+++ b/recipes-kde/plasma/tier3/baloo/baloo.bb
@@ -21,14 +21,14 @@ CMAKE_ALIGN_SYSROOT[2] = "KF5Baloo, -S${includedir}, -S${STAGING_INCDIR}"
 
 FILES_${PN} += "${datadir} \
     ${libdir}/kauth \
-    ${libdir}/${QT_DIR_NAME}/qml/org/kde/baloo \
-    ${libdir}/${QT_DIR_NAME}/plugins \
+    ${OE_QMAKE_PATH_QML}/org/kde/baloo \
+    ${OE_QMAKE_PATH_PLUGINS} \
 "
 
 FILES_${PN}-dbg += " \
 	${libdir}/*/.debug \
-	${libdir}/${QT_DIR_NAME}/qml/org/kde/baloo/.debug \
-	${libdir}/${QT_DIR_NAME}/plugins/.debug \
-	${libdir}/${QT_DIR_NAME}/plugins/kf5/*/.debug \
+	${OE_QMAKE_PATH_QML}/org/kde/baloo/.debug \
+	${OE_QMAKE_PATH_PLUGINS}/.debug \
+	${OE_QMAKE_PATH_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 f7651a20..6d3f4862 100644
--- a/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb
+++ b/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb
@@ -64,15 +64,15 @@ CMAKE_ALIGN_SYSROOT[4] = "LibTaskManager, -S${includedir}, -S${STAGING_INCDIR}"
 FILES_${PN} += " \
     ${datadir} \
     ${libdir}/libkdeinit5*.so \
-    ${libdir}/${QT_DIR_NAME}/plugins \
-    ${libdir}/${QT_DIR_NAME}/qml \
+    ${OE_QMAKE_PATH_PLUGINS} \
+    ${OE_QMAKE_PATH_QML} \
 "
 FILES_${PN}-dbg += " \
-    ${libdir}/${QT_DIR_NAME}/plugins/.debug \
-    ${libdir}/${QT_DIR_NAME}/plugins/*/.debug \
-    ${libdir}/${QT_DIR_NAME}/plugins/*/*/.debug \
-    ${libdir}/${QT_DIR_NAME}/qml/org/kde/*/*/.debug \
-    ${libdir}/${QT_DIR_NAME}/qml/org/kde/*/*/*/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/*/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/*/*/.debug \
+    ${OE_QMAKE_PATH_QML}/org/kde/*/*/.debug \
+    ${OE_QMAKE_PATH_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 77ce4dde..366d85b1 100644
--- a/recipes-kde/plasma/untier/breeze/breeze.bb
+++ b/recipes-kde/plasma/untier/breeze/breeze.bb
@@ -34,13 +34,13 @@ FILES_${PN} += " \
     ${datadir}/QtCurve \
     ${datadir}/wallpapers \
     \
-    ${libdir}/${QT_DIR_NAME}/plugins \
-    ${libdir}/${QT_DIR_NAME}/qml \
+    ${OE_QMAKE_PATH_PLUGINS} \
+    ${OE_QMAKE_PATH_QML} \
     ${libdir}/kconf_update_bin \
 "
 
 FILES_${PN}-dbg += " \
     ${libdir}/*/.debug \
     ${libdir}/*/*/.debug \
-    ${libdir}/${QT_DIR_NAME}/plugins/*/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/*/.debug \
 "
diff --git a/recipes-kde/plasma/untier/kde-cli-tools/kde-cli-tools.bb b/recipes-kde/plasma/untier/kde-cli-tools/kde-cli-tools.bb
index 01100ce0..590a2843 100644
--- 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,12 +29,12 @@ FILES_SOLIBSDEV = ""
 
 FILES_${PN} += " \
     ${datadir}/kservices5 \
-    ${libdir}/${QT_DIR_NAME}/plugins \
+    ${OE_QMAKE_PATH_PLUGINS} \
     ${libdir}/libkdeinit5_kcmshell5.so \
 "
 
 FILES_${PN}-dbg += " \
     ${libdir}/*/.debug \
     ${libdir}/${BPN}/*/.debug \
-    ${libdir}/${QT_DIR_NAME}/plugins/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/.debug \
 "
diff --git a/recipes-kde/plasma/untier/kde-gtk-config/kde-gtk-config.bb b/recipes-kde/plasma/untier/kde-gtk-config/kde-gtk-config.bb
index 3a31cbce..f69b2e9e 100644
--- 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}/${QT_DIR_NAME}/plugins \
+    ${OE_QMAKE_PATH_PLUGINS} \
 "
 
 FILES_${PN}-dbg += " \
-    ${libdir}/${QT_DIR_NAME}/plugins/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/.debug \
 "
diff --git a/recipes-kde/plasma/untier/kdeplasma-addons/kdeplasma-addons.bb b/recipes-kde/plasma/untier/kdeplasma-addons/kdeplasma-addons.bb
index cd68e6ec..a355fba9 100644
--- 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}/${QT_DIR_NAME}/plugins \
-    ${libdir}/${QT_DIR_NAME}/qml \
+    ${OE_QMAKE_PATH_PLUGINS} \
+    ${OE_QMAKE_PATH_QML} \
 "
 
 FILES_${PN}-dbg += " \
-    ${libdir}/${QT_DIR_NAME}/plugins/.debug \
-    ${libdir}/${QT_DIR_NAME}/plugins/*/*/.debug \
-    ${libdir}/${QT_DIR_NAME}/qml/org/kde/plasma/private/*/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/*/*/.debug \
+    ${OE_QMAKE_PATH_QML}/org/kde/plasma/private/*/.debug \
 "
diff --git a/recipes-kde/plasma/untier/khotkeys/khotkeys.bb b/recipes-kde/plasma/untier/khotkeys/khotkeys.bb
index 5dd2cbd2..dda0ecec 100644
--- a/recipes-kde/plasma/untier/khotkeys/khotkeys.bb
+++ b/recipes-kde/plasma/untier/khotkeys/khotkeys.bb
@@ -30,9 +30,9 @@ SRC_URI[sha256sum] = "bb6a42028ef92da96105e1e8ee32b03192950255a29df3aa183d4931bf
 FILES_${PN} += " \
     ${datadir}/kservices5 \
     ${datadir}/dbus-1 \
-    ${libdir}/${QT_DIR_NAME}/plugins \
+    ${OE_QMAKE_PATH_PLUGINS} \
 "
 
 FILES_${PN}-dbg += " \
-    ${libdir}/${QT_DIR_NAME}/plugins/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/.debug \
 "
diff --git a/recipes-kde/plasma/untier/kinfocenter/kinfocenter.bb b/recipes-kde/plasma/untier/kinfocenter/kinfocenter.bb
index 65da66d1..6dd16e9d 100644
--- a/recipes-kde/plasma/untier/kinfocenter/kinfocenter.bb
+++ b/recipes-kde/plasma/untier/kinfocenter/kinfocenter.bb
@@ -44,10 +44,10 @@ FILES_${PN} += " \
     ${datadir}/k*5 \
     ${datadir}/kpackage \
     \
-    ${libdir}/${QT_DIR_NAME}/plugins \
+    ${OE_QMAKE_PATH_PLUGINS} \
 "
 
 FILES_${PN}-dbg += " \
-    ${libdir}/${QT_DIR_NAME}/plugins/.debug \
-    ${libdir}/${QT_DIR_NAME}/plugins/*/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/*/.debug \
 "
diff --git a/recipes-kde/plasma/untier/kio-extras/kio-extras.bb b/recipes-kde/plasma/untier/kio-extras/kio-extras.bb
index d09cc5b3..5f8c220c 100644
--- a/recipes-kde/plasma/untier/kio-extras/kio-extras.bb
+++ b/recipes-kde/plasma/untier/kio-extras/kio-extras.bb
@@ -59,10 +59,10 @@ FILES_${PN} += " \
     ${datadir}/kio_docfilter \
     ${datadir}/solid \
     \
-    ${libdir}/${QT_DIR_NAME}/plugins \
+    ${OE_QMAKE_PATH_PLUGINS} \
 "
 
 FILES_${PN}-dbg += " \
-    ${libdir}/${QT_DIR_NAME}/plugins/.debug \
-    ${libdir}/${QT_DIR_NAME}/plugins/kf5/kio/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/kf5/kio/.debug \
 "
diff --git a/recipes-kde/plasma/untier/kscreen/kscreen.bb b/recipes-kde/plasma/untier/kscreen/kscreen.bb
index 936c166b..86023333 100644
--- 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}/${QT_DIR_NAME}/plugins \
+    ${OE_QMAKE_PATH_PLUGINS} \
 "
 
 FILES_${PN}-dbg += " \
-    ${libdir}/${QT_DIR_NAME}/plugins/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/.debug \
 "
diff --git a/recipes-kde/plasma/untier/kwin/kwin.bb b/recipes-kde/plasma/untier/kwin/kwin.bb
index 054b60c2..56aa4dad 100644
--- a/recipes-kde/plasma/untier/kwin/kwin.bb
+++ b/recipes-kde/plasma/untier/kwin/kwin.bb
@@ -64,8 +64,8 @@ FILES_${PN} += " \
     ${datadir}/dbus-1 \
     ${datadir}/icons \
     ${datadir}/*5 \
-    ${libdir}/${QT_DIR_NAME}/plugins \
-    ${libdir}/${QT_DIR_NAME}/qml \
+    ${OE_QMAKE_PATH_PLUGINS} \
+    ${OE_QMAKE_PATH_QML} \
     ${libdir}/kconf_update_bin \
 "
 
diff --git a/recipes-kde/plasma/untier/libkscreen/libkscreen.bb b/recipes-kde/plasma/untier/libkscreen/libkscreen.bb
index 2616c1e5..5f645842 100644
--- a/recipes-kde/plasma/untier/libkscreen/libkscreen.bb
+++ b/recipes-kde/plasma/untier/libkscreen/libkscreen.bb
@@ -22,11 +22,11 @@ SRC_URI += " \
 
 
 FILES_${PN} += " \
-    ${libdir}/${QT_DIR_NAME}/plugins \
+    ${OE_QMAKE_PATH_PLUGINS} \
 "
 
 FILES_${PN}-dbg += " \
-    ${libdir}/${QT_DIR_NAME}/plugins/kf5/kscreen/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/kf5/kscreen/.debug \
     ${libexecdir}/kf5/.debug \
 "
 
diff --git a/recipes-kde/plasma/untier/milou/milou.bb b/recipes-kde/plasma/untier/milou/milou.bb
index 2f832316..c2f780af 100644
--- a/recipes-kde/plasma/untier/milou/milou.bb
+++ b/recipes-kde/plasma/untier/milou/milou.bb
@@ -25,11 +25,11 @@ SRC_URI[sha256sum] = "0aad31fec55e8420cf2ec6016d6b0f4eef981260c8ce35f7596be067af
 FILES_${PN} += " \
     ${datadir}/k*5 \
     ${datadir}/plasma \
-    ${libdir}/${QT_DIR_NAME}/plugins \
-    ${libdir}/${QT_DIR_NAME}/qml \
+    ${OE_QMAKE_PATH_PLUGINS} \
+    ${OE_QMAKE_PATH_QML} \
 "
 
 FILES_${PN}-dbg += " \
-    ${libdir}/${QT_DIR_NAME}/plugins/.debug \
-    ${libdir}/${QT_DIR_NAME}/qml/*/*/*/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/.debug \
+    ${OE_QMAKE_PATH_QML}/*/*/*/.debug \
 "
diff --git a/recipes-kde/plasma/untier/muon/muon.bb b/recipes-kde/plasma/untier/muon/muon.bb
index e4e360f5..a27ce153 100644
--- 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}/${QT_DIR_NAME}/plugins \
-    ${libdir}/${QT_DIR_NAME}/qml \
+    ${OE_QMAKE_PATH_PLUGINS} \
+    ${OE_QMAKE_PATH_QML} \
 "
 
 FILES_${PN}-dbg += " \
-    ${libdir}/${QT_DIR_NAME}/plugins/*/.debug \
-    ${libdir}/${QT_DIR_NAME}/qml/org/kde/*/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/*/.debug \
+    ${OE_QMAKE_PATH_QML}/org/kde/*/.debug \
 "
diff --git a/recipes-kde/plasma/untier/oxygen/oxygen.bb b/recipes-kde/plasma/untier/oxygen/oxygen.bb
index 25f4556d..8414154d 100644
--- 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}/${QT_DIR_NAME}/plugins \
+    ${OE_QMAKE_PATH_PLUGINS} \
 "
 
 FILES_${PN}-dbg += " \
-    ${libdir}/${QT_DIR_NAME}/plugins/.debug \
-    ${libdir}/${QT_DIR_NAME}/plugins/*/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/*/.debug \
 "
diff --git a/recipes-kde/plasma/untier/plasma-desktop/plasma-desktop.bb b/recipes-kde/plasma/untier/plasma-desktop/plasma-desktop.bb
index d0a8fe4e..f535a915 100644
--- a/recipes-kde/plasma/untier/plasma-desktop/plasma-desktop.bb
+++ b/recipes-kde/plasma/untier/plasma-desktop/plasma-desktop.bb
@@ -60,16 +60,16 @@ FILES_${PN} += " \
     ${datadir}/solid \
     \
     ${libdir}/libkdeinit5_kaccess.so \
-    ${libdir}/${QT_DIR_NAME}/qml \
+    ${OE_QMAKE_PATH_QML} \
     ${libdir}/kauth \
-    ${libdir}/${QT_DIR_NAME}/plugins \
+    ${OE_QMAKE_PATH_PLUGINS} \
     ${libdir}/kconf_update_bin \
 "
 
 FILES_${PN}-dbg += " \
     ${libdir}/*/.debug \
-    ${libdir}/${QT_DIR_NAME}/plugins/.debug \
-    ${libdir}/${QT_DIR_NAME}/plugins/*/.debug \
-    ${libdir}/${QT_DIR_NAME}/qml/org/kde/*/*/.debug \
-    ${libdir}/${QT_DIR_NAME}/qml/org/kde/*/*/*/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/*/.debug \
+    ${OE_QMAKE_PATH_QML}/org/kde/*/*/.debug \
+    ${OE_QMAKE_PATH_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 501328c9..1e8ec576 100644
--- a/recipes-kde/plasma/untier/plasma-nm/plasma-nm.bb
+++ b/recipes-kde/plasma/untier/plasma-nm/plasma-nm.bb
@@ -49,12 +49,12 @@ FILES_SOLIBSDEV = ""
 FILES_${PN} += " \
     ${datadir}/k*5 \
     ${datadir}/plasma \
-    ${libdir}/${QT_DIR_NAME}/plugins \
-    ${libdir}/${QT_DIR_NAME}/qml \
+    ${OE_QMAKE_PATH_PLUGINS} \
+    ${OE_QMAKE_PATH_QML} \
     ${libdir}/*.so \
 "
 
 FILES_${PN}-dbg += " \
-    ${libdir}/${QT_DIR_NAME}/plugins/.debug \
-    ${libdir}/${QT_DIR_NAME}/qml/*/*/*/*/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/.debug \
+    ${OE_QMAKE_PATH_QML}/*/*/*/*/.debug \
 "
diff --git a/recipes-kde/plasma/untier/powerdevil/powerdevil.bb b/recipes-kde/plasma/untier/powerdevil/powerdevil.bb
index 4db88ecd..0fbac4b2 100644
--- 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}/${QT_DIR_NAME}/plugins \
+    ${OE_QMAKE_PATH_PLUGINS} \
     ${libdir}/kauth \
 "
 
 FILES_${PN}-dbg += " \
-    ${libdir}/${QT_DIR_NAME}/plugins/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/.debug \
     ${libdir}/kauth/.debug \
 "
diff --git a/recipes-kde/plasma/untier/sddm-kcm/sddm-kcm.bb b/recipes-kde/plasma/untier/sddm-kcm/sddm-kcm.bb
index e5b323ae..e032d117 100644
--- 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}/${QT_DIR_NAME}/plugins \
+    ${OE_QMAKE_PATH_PLUGINS} \
     ${libdir}/kauth \
 "
 
 FILES_${PN}-dbg += " \
-    ${libdir}/${QT_DIR_NAME}/plugins/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/.debug \
     ${libdir}/kauth/.debug \
 "
diff --git a/recipes-kde/plasma/untier/systemsettings/systemsettings.bb b/recipes-kde/plasma/untier/systemsettings/systemsettings.bb
index ef565cfd..15178fe4 100644
--- a/recipes-kde/plasma/untier/systemsettings/systemsettings.bb
+++ b/recipes-kde/plasma/untier/systemsettings/systemsettings.bb
@@ -28,9 +28,9 @@ SRC_URI[sha256sum] = "a077850478d72f46aac613574d35aafbfbbe2e7a1a3c5784853b82dcc2
 
 FILES_${PN} += " \
     ${datadir}/k*5 \
-    ${libdir}/${QT_DIR_NAME}/plugins \
+    ${OE_QMAKE_PATH_PLUGINS} \
 "
 
 FILES_${PN}-dbg += " \
-    ${libdir}/${QT_DIR_NAME}/plugins/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/.debug \
 "
diff --git a/recipes-lxqt/lxqt-qtplugin/lxqt-qtplugin_git.bb b/recipes-lxqt/lxqt-qtplugin/lxqt-qtplugin_git.bb
index eae36652..f5db40d8 100644
--- a/recipes-lxqt/lxqt-qtplugin/lxqt-qtplugin_git.bb
+++ b/recipes-lxqt/lxqt-qtplugin/lxqt-qtplugin_git.bb
@@ -13,6 +13,6 @@ SRC_URI += " \
     file://0002-Unify-naming-for-a-unique-lxqt.-No-more-suffixes.patch \
 "
 
-FILES_${PN} += "${libdir}/qt5/platformthemes"
-FILES_${PN}-dbg += "${libdir}/qt5/platformthemes/.debug"
+FILES_${PN} += "${libdir}/${QT_DIR_NAME}/platformthemes"
+FILES_${PN}-dbg += "${libdir}/${QT_DIR_NAME}/platformthemes/.debug"