[oe] [meta-qt5][PATCH v2 06/11] qt5: make qt5.inc reusable qt5-module.bbclass

Samuli Piippo samuli.piippo at theqtcompany.com
Tue Aug 25 11:43:48 UTC 2015 

qt5.inc has common parts that can be used to build any Qt5 module.
Make it a bbclass so that it is easily usable from other meta layers.

Signed-off-by: Samuli Piippo <samuli.piippo at theqtcompany.com>
---
 recipes-qt/qt5/qt5.inc => classes/qt5-module.bbclass | 0
 recipes-qt/examples/cinematicexperience_1.0.bb       | 2 +-
 recipes-qt/examples/qt5everywheredemo_1.0.bb         | 2 +-
 recipes-qt/examples/qt5nmapcarousedemo_1.0.bb        | 2 +-
 recipes-qt/examples/qt5nmapper_1.0.bb                | 2 +-
 recipes-qt/examples/qtsmarthome_1.0.bb               | 2 +-
 recipes-qt/examples/quitbattery_1.0.0.bb             | 2 +-
 recipes-qt/examples/quitindicators_1.0.1.bb          | 2 +-
 recipes-qt/libconnman-qt/libconnman-qt5_git.bb       | 2 +-
 recipes-qt/qt5/qt3d_git.bb                           | 2 +-
 recipes-qt/qt5/qtbase_git.bb                         | 2 +-
 recipes-qt/qt5/qtconnectivity_git.bb                 | 2 +-
 recipes-qt/qt5/qtdeclarative_git.bb                  | 2 +-
 recipes-qt/qt5/qtenginio_git.bb                      | 2 +-
 recipes-qt/qt5/qtgraphicaleffects_git.bb             | 2 +-
 recipes-qt/qt5/qtimageformats_git.bb                 | 2 +-
 recipes-qt/qt5/qtlocation_git.bb                     | 2 +-
 recipes-qt/qt5/qtmultimedia_git.bb                   | 2 +-
 recipes-qt/qt5/qtquick1_git.bb                       | 2 +-
 recipes-qt/qt5/qtquickcontrols_git.bb                | 2 +-
 recipes-qt/qt5/qtscript_git.bb                       | 2 +-
 recipes-qt/qt5/qtsensors_git.bb                      | 2 +-
 recipes-qt/qt5/qtserialport_git.bb                   | 2 +-
 recipes-qt/qt5/qtsvg_git.bb                          | 2 +-
 recipes-qt/qt5/qtsystems_git.bb                      | 2 +-
 recipes-qt/qt5/qttools_git.bb                        | 2 +-
 recipes-qt/qt5/qttranslations_git.bb                 | 2 +-
 recipes-qt/qt5/qtwayland_git.bb                      | 2 +-
 recipes-qt/qt5/qtwebchannel_git.bb                   | 2 +-
 recipes-qt/qt5/qtwebengine_git.bb                    | 2 +-
 recipes-qt/qt5/qtwebkit-examples_git.bb              | 2 +-
 recipes-qt/qt5/qtwebkit_git.bb                       | 2 +-
 recipes-qt/qt5/qtwebsockets_git.bb                   | 2 +-
 recipes-qt/qt5/qtx11extras_git.bb                    | 2 +-
 recipes-qt/qt5/qtxmlpatterns_git.bb                  | 2 +-
 35 files changed, 34 insertions(+), 34 deletions(-)
 rename recipes-qt/qt5/qt5.inc => classes/qt5-module.bbclass (100%)

diff --git a/recipes-qt/qt5/qt5.inc b/classes/qt5-module.bbclass
similarity index 100%
rename from recipes-qt/qt5/qt5.inc
rename to classes/qt5-module.bbclass
diff --git a/recipes-qt/examples/cinematicexperience_1.0.bb b/recipes-qt/examples/cinematicexperience_1.0.bb
index 116127f..b1eee73 100644
--- a/recipes-qt/examples/cinematicexperience_1.0.bb
+++ b/recipes-qt/examples/cinematicexperience_1.0.bb
@@ -21,7 +21,7 @@ S = "${WORKDIR}/Qt5_CinematicExperience_rpi_${PV}/"
 DEPENDS = "qtdeclarative qtgraphicaleffects"
 RDEPENDS_${PN} = "qtdeclarative-qmlplugins qtgraphicaleffects-qmlplugins"
 
-require recipes-qt/qt5/qt5.inc
+inherit qt5-module
 
 do_install() {
     install -d ${D}${datadir}/${P}
diff --git a/recipes-qt/examples/qt5everywheredemo_1.0.bb b/recipes-qt/examples/qt5everywheredemo_1.0.bb
index 0546b00..b906741 100644
--- a/recipes-qt/examples/qt5everywheredemo_1.0.bb
+++ b/recipes-qt/examples/qt5everywheredemo_1.0.bb
@@ -11,7 +11,7 @@ SRC_URI = "${QT_GIT}/qt-labs/qt5-everywhere-demo.git"
 
 S = "${WORKDIR}/git/QtDemo"
 
-require recipes-qt/qt5/qt5.inc
+inherit qt5-module
 
 do_install() {
     install -d ${D}${datadir}/${P}
diff --git a/recipes-qt/examples/qt5nmapcarousedemo_1.0.bb b/recipes-qt/examples/qt5nmapcarousedemo_1.0.bb
index 7edf727..67525ca 100644
--- a/recipes-qt/examples/qt5nmapcarousedemo_1.0.bb
+++ b/recipes-qt/examples/qt5nmapcarousedemo_1.0.bb
@@ -12,7 +12,7 @@ SRC_URI[sha256sum] = "445da212074a10a432f4508d125814212bbe7a967bfa47b015b92dfac6
 
 S = "${WORKDIR}/Qt5_NMap_CarouselDemo_1.0"
 
-require recipes-qt/qt5/qt5.inc
+inherit qt5-module
 
 do_install() {
     install -d ${D}${datadir}/${P}
diff --git a/recipes-qt/examples/qt5nmapper_1.0.bb b/recipes-qt/examples/qt5nmapper_1.0.bb
index 77cb067..cc61b18 100644
--- a/recipes-qt/examples/qt5nmapper_1.0.bb
+++ b/recipes-qt/examples/qt5nmapper_1.0.bb
@@ -13,7 +13,7 @@ SRC_URI[sha256sum] = "607fbf4c448f00d3c563f9ef8a582bcb6e8fe550e80b56bf8d9127a417
 
 S = "${WORKDIR}/Qt5_NMapper_1.0"
 
-require recipes-qt/qt5/qt5.inc
+inherit qt5-module
 
 do_install() {
     install -d ${D}${datadir}/${P}
diff --git a/recipes-qt/examples/qtsmarthome_1.0.bb b/recipes-qt/examples/qtsmarthome_1.0.bb
index 944c4dc..3af01f4 100644
--- a/recipes-qt/examples/qtsmarthome_1.0.bb
+++ b/recipes-qt/examples/qtsmarthome_1.0.bb
@@ -13,7 +13,7 @@ SRC_URI[sha256sum] = "fceaa813c33e462bad6c0383eaef81a6f6e586c15d1fa73898173b517f
 
 S = "${WORKDIR}/smarthome_src"
 
-require recipes-qt/qt5/qt5.inc
+inherit qt5-module
 
 do_install() {
     install -d ${D}${datadir}/${P}
diff --git a/recipes-qt/examples/quitbattery_1.0.0.bb b/recipes-qt/examples/quitbattery_1.0.0.bb
index ea218d7..a8fb77d 100644
--- a/recipes-qt/examples/quitbattery_1.0.0.bb
+++ b/recipes-qt/examples/quitbattery_1.0.0.bb
@@ -12,7 +12,7 @@ SRC_URI[sha256sum] = "38dcb7630553c397f9d8a53c6411b1a6237956ed8dd4859e01487b1dd8
 
 S = "${WORKDIR}/QUItBattery_1.0.0"
 
-require recipes-qt/qt5/qt5.inc
+inherit qt5-module
 
 do_install() {
     install -d ${D}${datadir}/${P}
diff --git a/recipes-qt/examples/quitindicators_1.0.1.bb b/recipes-qt/examples/quitindicators_1.0.1.bb
index 19a861a..0377350 100644
--- a/recipes-qt/examples/quitindicators_1.0.1.bb
+++ b/recipes-qt/examples/quitindicators_1.0.1.bb
@@ -11,7 +11,7 @@ SRC_URI[sha256sum] = "db84112adbde9b6f28c129e8fb37a6912f4bc34bed18e57f570fb78ea0
 
 S = "${WORKDIR}/QUItIndicators_1.0.1"
 
-require recipes-qt/qt5/qt5.inc
+inherit qt5-module
 
 do_install() {
     install -d ${D}${datadir}/${P}
diff --git a/recipes-qt/libconnman-qt/libconnman-qt5_git.bb b/recipes-qt/libconnman-qt/libconnman-qt5_git.bb
index f79dc0c..fcd7cbf 100644
--- a/recipes-qt/libconnman-qt/libconnman-qt5_git.bb
+++ b/recipes-qt/libconnman-qt/libconnman-qt5_git.bb
@@ -1,4 +1,4 @@
-require recipes-qt/qt5/qt5.inc
+inherit qt5-module
 
 SUMMARY = "Qt Library for ConnMan"
 HOMEPAGE = "https://github.com/nemomobile/libconnman-qt"
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index 7f61271..1135d1d 100644
--- a/recipes-qt/qt5/qt3d_git.bb
+++ b/recipes-qt/qt5/qt3d_git.bb
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 LICENSE = "GFDL-1.3 & LGPL-3.0 & DIGIA-TPLA-2.4 | GPL-2.0"
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index f472c98..cf77a44 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb
index 0cb724e..187ec08 100644
--- a/recipes-qt/qt5/qtconnectivity_git.bb
+++ b/recipes-qt/qt5/qtconnectivity_git.bb
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index f9689e6..5f6c4d8 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 # There are no LGPLv3-only licensed files in this component.
diff --git a/recipes-qt/qt5/qtenginio_git.bb b/recipes-qt/qt5/qtenginio_git.bb
index f80e42e..84158fa 100644
--- a/recipes-qt/qt5/qtenginio_git.bb
+++ b/recipes-qt/qt5/qtenginio_git.bb
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 LICENSE = "BSD & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb
index 64c9a10..9d175b2 100644
--- a/recipes-qt/qt5/qtgraphicaleffects_git.bb
+++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 # There are no LGPLv3-only licensed files in this component.
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb
index f3726da..5dd3bb9 100644
--- a/recipes-qt/qt5/qtimageformats_git.bb
+++ b/recipes-qt/qt5/qtimageformats_git.bb
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0"
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index 963c576..c0ea2bb 100644
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index 5c05145..adec185 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bb
+++ b/recipes-qt/qt5/qtmultimedia_git.bb
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 # There are no LGPLv3-only licensed files in this component.
diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb
index 1dcba1e..2d62570 100644
--- a/recipes-qt/qt5/qtquick1_git.bb
+++ b/recipes-qt/qt5/qtquick1_git.bb
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 # There are no LGPLv3-only licensed files in this component.
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
index 51db1ae..5ab10ea 100644
--- a/recipes-qt/qt5/qtquickcontrols_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols_git.bb
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0"
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb
index a54deb8..f650efa 100644
--- a/recipes-qt/qt5/qtscript_git.bb
+++ b/recipes-qt/qt5/qtscript_git.bb
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 # There are no LGPLv3-only licensed files in this component.
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb
index 02688a6..7b39cfb 100644
--- a/recipes-qt/qt5/qtsensors_git.bb
+++ b/recipes-qt/qt5/qtsensors_git.bb
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 # There are no LGPLv3-only licensed files in this component.
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb
index 5f41974..2139448 100644
--- a/recipes-qt/qt5/qtserialport_git.bb
+++ b/recipes-qt/qt5/qtserialport_git.bb
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 # text of LGPL_EXCEPTION.txt and LICENSE.FDL is slightly different than what
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb
index 6350e97..b13bb70 100644
--- a/recipes-qt/qt5/qtsvg_git.bb
+++ b/recipes-qt/qt5/qtsvg_git.bb
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 # There are no LGPLv3-only licensed files in this component.
diff --git a/recipes-qt/qt5/qtsystems_git.bb b/recipes-qt/qt5/qtsystems_git.bb
index 781cd38..493736e 100644
--- a/recipes-qt/qt5/qtsystems_git.bb
+++ b/recipes-qt/qt5/qtsystems_git.bb
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 LICENSE = "GFDL-1.3 & LGPL-2.1 | GPL-3.0"
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index afc8984..443d58c 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb
index 10ec1aa..b63d2aa 100644
--- a/recipes-qt/qt5/qttranslations_git.bb
+++ b/recipes-qt/qt5/qttranslations_git.bb
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 LICENSE = "(LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index 361b54a..a725404 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 # There are no LGPLv3-only licensed files in this component.
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb
index 236eb47..55acae4 100644
--- a/recipes-qt/qt5/qtwebchannel_git.bb
+++ b/recipes-qt/qt5/qtwebchannel_git.bb
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 # There are no LGPLv3-only licensed files in this component.
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 2933bf7..fa0f019 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -26,7 +26,7 @@ inherit gettext
 inherit pythonnative
 inherit perlnative
 
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 # To avoid trouble start with not separated build directory
diff --git a/recipes-qt/qt5/qtwebkit-examples_git.bb b/recipes-qt/qt5/qtwebkit-examples_git.bb
index 62e9612..bf0b3d6 100644
--- a/recipes-qt/qt5/qtwebkit-examples_git.bb
+++ b/recipes-qt/qt5/qtwebkit-examples_git.bb
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 # There are no LGPLv3-only licensed files in this component.
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb
index 74f98a7..d42b4f1 100644
--- a/recipes-qt/qt5/qtwebkit_git.bb
+++ b/recipes-qt/qt5/qtwebkit_git.bb
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 LICENSE = "BSD & LGPLv2+ | GPL-2.0"
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb
index b1e2951..c30b0ca 100644
--- a/recipes-qt/qt5/qtwebsockets_git.bb
+++ b/recipes-qt/qt5/qtwebsockets_git.bb
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 LICENSE = "GFDL-1.3 & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb
index e73feb7..c108c10 100644
--- a/recipes-qt/qt5/qtx11extras_git.bb
+++ b/recipes-qt/qt5/qtx11extras_git.bb
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb
index 3c273db..66dddd2 100644
--- a/recipes-qt/qt5/qtxmlpatterns_git.bb
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bb
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 # There are no LGPLv3-only licensed files in this component.
-- 
1.9.1

More information about the Openembedded-devel mailing list