qtdeclarative: Fix SEPB build, remove module_qmake.conf

(From meta-qt5 rev: ea8d37c17dda7d9aa2e1a825b0bef492204bbb0f)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

diff --git a/meta-qt5/recipes-qt/qt5/files/module_qmake.conf b/meta-qt5/recipes-qt/qt5/files/module_qmake.conf
deleted file mode 100644 (file)
index 4285ae8..0000000
--- a/meta-qt5/recipes-qt/qt5/files/module_qmake.conf
+++ /dev/null
@@ -1 +0,0 @@
-load(qt_build_config)
\ No newline at end of file

diff --git a/meta-qt5/recipes-qt/qt5/qtdeclarative.inc b/meta-qt5/recipes-qt/qt5/qtdeclarative.inc
index 5746413..e74ffd9 100644 (file)
--- a/meta-qt5/recipes-qt/qt5/qtdeclarative.inc
+++ b/meta-qt5/recipes-qt/qt5/qtdeclarative.inc
@@ -10,21 +10,11 @@ INC_PR = "r0"
 
 inherit qmake5
 
-SRC_URI += " \
-    file://module_qmake.conf \
-"
-
-export QT_CONF_PATH="${WORKDIR}/qt.conf"
-
 do_configure () {
     # Avoid setting QMAKE_LINK from LD (since we want the linker to be g++)
     unset LD
 
-    # This should not be needed. Perhaps the lack of this file is an indication
-    # of an error on the native recipe...
-    cp ${WORKDIR}/module_qmake.conf ${S}/.qmake.conf
-
-    ${OE_QMAKE_QMAKE} -r -d
+    ${OE_QMAKE_QMAKE} -r -d ${S}
 }
 
 do_install() {