qt5: add PN-qmlplugins packages and remove them from modules, use OE_QMAKE_PATH_* variables

* qml and imports go to PN-qmlplugins
* all other plugins go to just PN-plugins

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

11 files changed, 62 insertions, 135 deletions

diff --git a/recipes-qt/qt5/qt3d.inc b/recipes-qt/qt5/qt3d.inc
index 1ff4fe84..92b2628a 100644
--- a/recipes-qt/qt5/qt3d.inc
+++ b/recipes-qt/qt5/qt3d.inc
@@ -7,13 +7,3 @@ LIC_FILES_CHKSUM ?= "file://LICENSE.LGPL;md5=4ac745f4b16b419fa48a24d41e983c40 \
                      file://LICENSE.FDL;md5=f70ee9a6c44ae8917586fea34dff0ab5"
 
 INC_PR = "r1"
-
-FILES_${PN}-plugins += " \
-            ${libdir}/${QT_DIR_NAME}/qml/Qt3D/libqthreedqmlplugin.so \
-            ${libdir}/${QT_DIR_NAME}/qml/Qt3D/qmldir \
-            ${libdir}/${QT_DIR_NAME}/qml/Qt3D/plugins.qmltypes \
-            ${libdir}/${QT_DIR_NAME}/qml/Qt3D/Shapes \
-"
-FILES_${PN}-plugins-dbg += " \
-            ${libdir}/${QT_DIR_NAME}/qml/Qt3D/.debug \
-"
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc
index 474eee21..a748d896 100644
--- a/recipes-qt/qt5/qt5.inc
+++ b/recipes-qt/qt5/qt5.inc
@@ -85,52 +85,81 @@ do_install() {
     qmake5_base_do_install
 }
 
-PACKAGES =. "${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-tools ${PN}-plugins ${PN}-mkspecs "
+PACKAGES =. "${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs "
+
+# extra -dbg packages
+FILES_${PN}-qmlplugins-dbg = " \
+    ${OE_QMAKE_PATH_QML}/*/.debug \
+    ${OE_QMAKE_PATH_QML}/*/*/.debug \
+    ${OE_QMAKE_PATH_QML}/*/*/*/.debug \
+    ${OE_QMAKE_PATH_IMPORTS}/*/.debug \
+    ${OE_QMAKE_PATH_IMPORTS}/*/*/.debug \
+    ${OE_QMAKE_PATH_IMPORTS}/*/*/*/.debug \
+"
 FILES_${PN}-tools-dbg = " \
-    ${bindir}/${QT_DIR_NAME}/.debug \
-    ${bindir}/.debug \
+    ${OE_QMAKE_PATH_BINS}/.debug \
 "
 FILES_${PN}-plugins-dbg = " \
-    ${libdir}/${QT_DIR_NAME}/plugins/*/.debug/* \
-    ${libdir}/plugins/*/.debug/* \
+    ${OE_QMAKE_PATH_PLUGINS}/*/.debug/* \
+"
+
+# extra packages
+# qmlplugins 1-3 levels of subdirs qmldir + *{.so,*.qmltypes,*.qml,*js}
+FILES_${PN}-qmlplugins = " \
+    ${OE_QMAKE_PATH_QML}/*/*${SOLIBSDEV} \
+    ${OE_QMAKE_PATH_QML}/*/qmldir \
+    ${OE_QMAKE_PATH_QML}/*/*.qmltypes \
+    ${OE_QMAKE_PATH_QML}/*/*.qml \
+    ${OE_QMAKE_PATH_QML}/*/*.js \
+    ${OE_QMAKE_PATH_QML}/*/*/*${SOLIBSDEV} \
+    ${OE_QMAKE_PATH_QML}/*/*/qmldir \
+    ${OE_QMAKE_PATH_QML}/*/*/*.qmltypes \
+    ${OE_QMAKE_PATH_QML}/*/*/*.qml \
+    ${OE_QMAKE_PATH_QML}/*/*/*.js \
+    ${OE_QMAKE_PATH_QML}/*/*/*/*${SOLIBSDEV} \
+    ${OE_QMAKE_PATH_QML}/*/*/*/qmldir \
+    ${OE_QMAKE_PATH_QML}/*/*/*/*.qmltypes \
+    ${OE_QMAKE_PATH_QML}/*/*/*/*.qml \
+    ${OE_QMAKE_PATH_QML}/*/*/*/*.js \
+    ${OE_QMAKE_PATH_IMPORTS}/*.qmltypes \
+    ${OE_QMAKE_PATH_IMPORTS}/*/*${SOLIBSDEV} \
+    ${OE_QMAKE_PATH_IMPORTS}/*/*.qmltypes \
+    ${OE_QMAKE_PATH_IMPORTS}/*/qmldir \
+    ${OE_QMAKE_PATH_IMPORTS}/*/*/*${SOLIBSDEV} \
+    ${OE_QMAKE_PATH_IMPORTS}/*/*/*.qmltypes \
+    ${OE_QMAKE_PATH_IMPORTS}/*/*/qmldir \
+    ${OE_QMAKE_PATH_IMPORTS}/*/*/*/*${SOLIBSDEV} \
+    ${OE_QMAKE_PATH_IMPORTS}/*/*/*/*.qmltypes \
+    ${OE_QMAKE_PATH_IMPORTS}/*/*/*/qmldir \
 "
 FILES_${PN}-tools = " \
-    ${bindir}/${QT_DIR_NAME}/* \
-    ${bindir}/* \
+    ${OE_QMAKE_PATH_BINS}/* \
 "
 FILES_${PN}-plugins = " \
-    ${libdir}/${QT_DIR_NAME}/plugins/*/*${SOLIBSDEV} \
-    ${libdir}/plugins/*/*${SOLIBSDEV} \
+    ${OE_QMAKE_PATH_PLUGINS}/*/*${SOLIBSDEV} \
 "
-FILES_${PN}-mkspecs += "\
-    ${libdir}/${QT_DIR_NAME}/mkspecs \
-    ${libdir}/mkspecs \
+FILES_${PN}-mkspecs = "\
+    ${OE_QMAKE_PATH_ARCHDATA}/mkspecs \
 "
+
+# modifications to normal packages
 FILES_${PN} += " \
-    ${libdir}/${QT_DIR_NAME}/lib*${SOLIBS} \
-    ${libdir}/lib*${SOLIBS} \
+    ${OE_QMAKE_PATH_LIBS}/lib*${SOLIBS} \
+    ${OE_QMAKE_PATH_LIBEXECS} \
 "
 FILES_${PN}-dev += " \
-    ${libdir}/${QT_DIR_NAME}/pkgconfig \
-    ${libdir}/${QT_DIR_NAME}/cmake/* \
-    ${libdir}/${QT_DIR_NAME}/*.prl \
-    ${libdir}/${QT_DIR_NAME}/*.la \
-    ${datadir}/${QT_DIR_NAME}/* \
-    ${includedir}/${QT_DIR_NAME}/* \
-    ${libdir}/pkgconfig \
-    ${libdir}/cmake/* \
-    ${libdir}/*.prl \
-    ${libdir}/*.la \
-    ${datadir}/* \
-    ${includedir}/* \
+    ${OE_QMAKE_PATH_LIBS}/lib*${SOLIBSDEV} \
+    ${OE_QMAKE_PATH_LIBS}/pkgconfig \
+    ${OE_QMAKE_PATH_LIBS}/cmake/* \
+    ${OE_QMAKE_PATH_LIBS}/*.prl \
+    ${OE_QMAKE_PATH_LIBS}/*.la \
+    ${OE_QMAKE_PATH_DATA}/* \
+    ${OE_QMAKE_PATH_HEADERS}/* \
 "
 FILES_${PN}-dbg += " \
-    ${libdir}/${QT_DIR_NAME}/.debug \
-    ${libdir}/${QT_DIR_NAME}/lib*${SOLIBSDEV} \
-    ${libdir}/.debug \
-    ${libdir}/lib*${SOLIBSDEV} \
+    ${OE_QMAKE_PATH_LIBS}/.debug \
+    ${OE_QMAKE_PATH_LIBEXECS}/.debug \
 "
 FILES_${PN}-staticdev += " \
-    ${libdir}/${QT_DIR_NAME}/*.a \
-    ${libdir}/*.a \
+    ${OE_QMAKE_PATH_LIBS}/*.a \
 "
diff --git a/recipes-qt/qt5/qtdeclarative.inc b/recipes-qt/qt5/qtdeclarative.inc
index a4f0692e..8cb21ff1 100644
--- a/recipes-qt/qt5/qtdeclarative.inc
+++ b/recipes-qt/qt5/qtdeclarative.inc
@@ -3,20 +3,3 @@ require qt5module.inc
 DEPENDS += "qtjsbackend qtsvg qtxmlpatterns"
 
 INC_PR = "r0"
-
-FILES_${PN}-qmlplugins-dbg = " \
-    ${libdir}/${QT_DIR_NAME}/qml/*/.debug \
-    ${libdir}/${QT_DIR_NAME}/qml/*/*/.debug \
-    ${libdir}/${QT_DIR_NAME}/qml/*/*/*/.debug \
-"
-FILES_${PN}-qmltooling-dbg = " \
-    ${libdir}/${QT_DIR_NAME}/plugins/qmltooling/.debug/* \
-"
-FILES_${PN}-qmlplugins = " \
-    ${libdir}/${QT_DIR_NAME}/qml/* \
-"
-FILES_${PN}-qmltooling = " \
-    ${libdir}/${QT_DIR_NAME}/plugins/qmltooling/* \
-"
-
-PACKAGES .= " ${PN}-qmlplugins-dbg ${PN}-qmltooling-dbg ${PN}-qmlplugins ${PN}-qmltooling"
diff --git a/recipes-qt/qt5/qtgraphicaleffects.inc b/recipes-qt/qt5/qtgraphicaleffects.inc
index 874c6064..a6b0fe9d 100644
--- a/recipes-qt/qt5/qtgraphicaleffects.inc
+++ b/recipes-qt/qt5/qtgraphicaleffects.inc
@@ -1,12 +1,5 @@
 require qt5module.inc
 
-INC_PR = "r0"
-
 DEPENDS += "qtdeclarative"
 
-FILES_${PN} += " \
-            ${libdir}/${QT_DIR_NAME}/qml/QtGraphicalEffects/qmldir \
-            ${libdir}/${QT_DIR_NAME}/qml/QtGraphicalEffects/*.qml \
-            ${libdir}/${QT_DIR_NAME}/qml/QtGraphicalEffects/private/*.qml \
-"
-
+INC_PR = "r0"
diff --git a/recipes-qt/qt5/qtjsondb.inc b/recipes-qt/qt5/qtjsondb.inc
index 044608d5..887b2610 100644
--- a/recipes-qt/qt5/qtjsondb.inc
+++ b/recipes-qt/qt5/qtjsondb.inc
@@ -10,13 +10,3 @@ LIC_FILES_CHKSUM = "file://${S}/doc/src/qtjsondb.qdoc;endline=26;md5=757f4eda130
 "
 
 INC_PR = "r0"
-
-PACKAGES += "${PN}-qmlplugins ${PN}-qmlplugins-dbg"
-
-FILES_${PN}-qmlplugins = " \
-    ${OE_QMAKE_PATH_QML}/QtJsonDb/qmldir \
-    ${OE_QMAKE_PATH_QML}/QtJsonDb/libjsondbplugin.so \
-"
-FILES_${PN}-qmlplugins-dbg = " \
-    ${OE_QMAKE_PATH_QML}/QtJsonDb/.debug \
-"
diff --git a/recipes-qt/qt5/qtmultimedia.inc b/recipes-qt/qt5/qtmultimedia.inc
index c2276225..c2003fdd 100644
--- a/recipes-qt/qt5/qtmultimedia.inc
+++ b/recipes-qt/qt5/qtmultimedia.inc
@@ -3,16 +3,3 @@ require qt5module.inc
 DEPENDS += "qtdeclarative gstreamer alsa-lib "
 
 INC_PR = "r0"
-
-PACKAGES += "${PN}-qmlplugins-dbg ${PN}-qmlplugins"
-
-FILES_${PN}-qmlplugins = " \
-    ${OE_QMAKE_PATH_QML}/QtMultimedia/qmldir \
-    ${OE_QMAKE_PATH_QML}/QtMultimedia/plugins.qmltypes \
-    ${OE_QMAKE_PATH_QML}/QtMultimedia/Video.qml \
-    ${OE_QMAKE_PATH_QML}/QtMultimedia/libdeclarative_multimedia.so \
-"
-
-FILES_${PN}-qmlplugins-dbg = " \
-    ${OE_QMAKE_PATH_QML}/QtMultimedia/.debug \
-"
diff --git a/recipes-qt/qt5/qtquick1.inc b/recipes-qt/qt5/qtquick1.inc
index 7a38eabb..8befa813 100644
--- a/recipes-qt/qt5/qtquick1.inc
+++ b/recipes-qt/qt5/qtquick1.inc
@@ -3,12 +3,3 @@ require qt5module.inc
 DEPENDS += "qtscript"
 
 INC_PR = "r0"
-
-FILES_${PN}-plugins += " \
-            ${libdir}/qt5/imports/builtins.qmltypes \
-            ${libdir}/qt5/imports/Qt/labs/*/qmldir \
-            ${libdir}/qt5/imports/Qt/labs/*/plugins.qmltypes \
-            ${libdir}/qt5/imports/Qt/labs/*/*${SOLIBSDEV} \
-"
-
-FILES_${PN}-plugins-dbg += "${libdir}/qt5/imports/Qt/labs/*/.debug/*"
diff --git a/recipes-qt/qt5/qtsensors.inc b/recipes-qt/qt5/qtsensors.inc
index 9c8d15d7..a6b0fe9d 100644
--- a/recipes-qt/qt5/qtsensors.inc
+++ b/recipes-qt/qt5/qtsensors.inc
@@ -3,12 +3,3 @@ require qt5module.inc
 DEPENDS += "qtdeclarative"
 
 INC_PR = "r0"
-
-FILES_${PN}-plugins += " \
-            ${libdir}/${QT_DIR_NAME}/qml/QtSensors/qmldir \
-            ${libdir}/${QT_DIR_NAME}/qml/QtSensors/plugins.qmltypes \
-            ${libdir}/${QT_DIR_NAME}/qml/QtSensors/*${SOLIBSDEV} \
-"
-FILES_${PN}-plugins-dbg += " \
-            ${libdir}/${QT_DIR_NAME}/qml/QtSensors/.debug/* \
-"
diff --git a/recipes-qt/qt5/qtsystems.inc b/recipes-qt/qt5/qtsystems.inc
index 5159c686..2c6d144b 100644
--- a/recipes-qt/qt5/qtsystems.inc
+++ b/recipes-qt/qt5/qtsystems.inc
@@ -10,15 +10,3 @@ LIC_FILES_CHKSUM = "file://${S}/src/imports/systeminfo/qsysteminfo.cpp;endline=4
 "
 
 INC_PR = "r0"
-
-PACKAGES += "${PN}-qmlplugins-dbg ${PN}-qmlplugins"
-
-FILES_${PN}-qmlplugins = " \
-    ${OE_QMAKE_PATH_QML}/*/*.so \
-    ${OE_QMAKE_PATH_QML}/*/qmldir \
-    ${OE_QMAKE_PATH_QML}/*/plugins.qmltypes \
-"
-
-FILES_${PN}-qmlplugins-dbg = " \
-    ${OE_QMAKE_PATH_QML}/*/.debug \
-"
diff --git a/recipes-qt/qt5/qtwebkit.inc b/recipes-qt/qt5/qtwebkit.inc
index 2100ee16..27c27031 100644
--- a/recipes-qt/qt5/qtwebkit.inc
+++ b/recipes-qt/qt5/qtwebkit.inc
@@ -8,17 +8,3 @@ do_configure_append() {
     # Fix rpaths for QtWebProcess
     find -name "Makefile*" | xargs sed -i "s|-Wl,-rpath,${SEPB}/lib||g"
 }
-
-PACKAGES += "${PN}-qmlplugins-dbg ${PN}-qmlplugins"
-
-FILES_${PN}-qmlplugins = " \
-    ${OE_QMAKE_PATH_QML}/QtWebKit/libqmlwebkitplugin.so \
-    ${OE_QMAKE_PATH_QML}/QtWebKit/qmldir \
-    ${OE_QMAKE_PATH_QML}/QtWebKit/experimental/libqmlwebkitexperimentalplugin.so \
-    ${OE_QMAKE_PATH_QML}/QtWebKit/experimental/qmldir \
-"
-
-FILES_${PN}-qmlplugins-dbg = " \
-    ${OE_QMAKE_PATH_QML}/QtWebKit/experimental/.debug \
-    ${OE_QMAKE_PATH_QML}/QtWebKit/.debug \
-"
diff --git a/recipes-qt/qt5/qtxmlpatterns.inc b/recipes-qt/qt5/qtxmlpatterns.inc
index 1824f93d..8c28b2b4 100644
--- a/recipes-qt/qt5/qtxmlpatterns.inc
+++ b/recipes-qt/qt5/qtxmlpatterns.inc
@@ -1,4 +1,3 @@
 require qt5module.inc
 
 INC_PR = "r0"
-