qt5module.inc: move shared logic to new .inc file

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

3 files changed, 13 insertions, 16 deletions

diff --git a/recipes-qt/qt5/qt5module.inc b/recipes-qt/qt5/qt5module.inc
new file mode 100644
index 00000000..45053f0b
--- /dev/null
+++ b/recipes-qt/qt5/qt5module.inc
@@ -0,0 +1,9 @@
+require qt5.inc
+
+DEPENDS += "qtbase"
+
+inherit qmake5
+
+do_configure_append () {
+    ${OE_QMAKE_QMAKE} ${OE_QMAKE_DEBUG_OUTPUT} -r ${S}
+}
diff --git a/recipes-qt/qt5/qtdeclarative.inc b/recipes-qt/qt5/qtdeclarative.inc
index 9b82b225..b3b9007f 100644
--- a/recipes-qt/qt5/qtdeclarative.inc
+++ b/recipes-qt/qt5/qtdeclarative.inc
@@ -1,15 +1,9 @@
-require qt5.inc
+require qt5module.inc
 
-DEPENDS = "qtbase qtjsbackend"
+DEPENDS += "qtjsbackend"
 
 INC_PR = "r0"
 
-inherit qmake5
-
-do_configure_append () {
-    ${OE_QMAKE_QMAKE} ${OE_QMAKE_DEBUG_OUTPUT} -r ${S}
-}
-
 FILES_${PN}-qmlplugins-dbg = " \
     ${libdir}/${QT_DIR_NAME}/qml/*/.debug \
     ${libdir}/${QT_DIR_NAME}/qml/*/*/.debug \
diff --git a/recipes-qt/qt5/qtjsbackend.inc b/recipes-qt/qt5/qtjsbackend.inc
index 66ab57b0..7ead9dde 100644
--- a/recipes-qt/qt5/qtjsbackend.inc
+++ b/recipes-qt/qt5/qtjsbackend.inc
@@ -1,4 +1,4 @@
-require qt5.inc
+require qt5module.inc
 
 # doesn't have GFDL-1.3 like qtbase, LICENSE files are missing in 5.0.0 and 5.0.1, this is for 5.0.2 and git
 LICENSE = "LGPL-2.1 | GPL-3.0"
@@ -7,16 +7,10 @@ LIC_FILES_CHKSUM ?= "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
                      file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
 "
 
-DEPENDS = "qtbase qtjsbackend-native"
+DEPENDS += "qtjsbackend-native"
 
 INC_PR = "r0"
 
-inherit qmake5
-
 SRC_URI += " \
     file://0002-v8.pro-respect-external-host-bindir-when-set.patch \
 "
-
-do_configure_append () {
-    ${OE_QMAKE_QMAKE} ${OE_QMAKE_DEBUG_OUTPUT} -r ${S}
-}