diff options
| -rw-r--r-- | recipes-qt/qt5/files/module_qmake.conf | 1 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtdeclarative.inc | 12 |
2 files changed, 1 insertions, 12 deletions
diff --git a/recipes-qt/qt5/files/module_qmake.conf b/recipes-qt/qt5/files/module_qmake.conf deleted file mode 100644 index 4285ae84..00000000 --- a/recipes-qt/qt5/files/module_qmake.conf +++ /dev/null | |||
| @@ -1 +0,0 @@ | |||
| 1 | load(qt_build_config) \ No newline at end of file | ||
diff --git a/recipes-qt/qt5/qtdeclarative.inc b/recipes-qt/qt5/qtdeclarative.inc index 57464134..e74ffd91 100644 --- a/recipes-qt/qt5/qtdeclarative.inc +++ b/recipes-qt/qt5/qtdeclarative.inc | |||
| @@ -10,21 +10,11 @@ INC_PR = "r0" | |||
| 10 | 10 | ||
| 11 | inherit qmake5 | 11 | inherit qmake5 |
| 12 | 12 | ||
| 13 | SRC_URI += " \ | ||
| 14 | file://module_qmake.conf \ | ||
| 15 | " | ||
| 16 | |||
| 17 | export QT_CONF_PATH="${WORKDIR}/qt.conf" | ||
| 18 | |||
| 19 | do_configure () { | 13 | do_configure () { |
| 20 | # Avoid setting QMAKE_LINK from LD (since we want the linker to be g++) | 14 | # Avoid setting QMAKE_LINK from LD (since we want the linker to be g++) |
| 21 | unset LD | 15 | unset LD |
| 22 | 16 | ||
| 23 | # This should not be needed. Perhaps the lack of this file is an indication | 17 | ${OE_QMAKE_QMAKE} -r -d ${S} |
| 24 | # of an error on the native recipe... | ||
| 25 | cp ${WORKDIR}/module_qmake.conf ${S}/.qmake.conf | ||
| 26 | |||
| 27 | ${OE_QMAKE_QMAKE} -r -d | ||
| 28 | } | 18 | } |
| 29 | 19 | ||
| 30 | do_install() { | 20 | do_install() { |
