diff --git a/recipes-qt/qt5/qtjsbackend-native.inc b/recipes-qt/qt5/qtjsbackend-native.inc index 0158dd6541..7595e53d5b 100644 --- a/recipes-qt/qt5/qtjsbackend-native.inc +++ b/recipes-qt/qt5/qtjsbackend-native.inc @@ -7,8 +7,6 @@ INC_PR = "r0" inherit native -#FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtjsbacked:" - SRC_URI += "\ file://qmake.conf \ file://0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch \ diff --git a/recipes-qt/qt5/qtjsbackend-native_4.999+git.bb b/recipes-qt/qt5/qtjsbackend-native_4.999+git.bb index 93a9be000f..54dd21a76d 100644 --- a/recipes-qt/qt5/qtjsbackend-native_4.999+git.bb +++ b/recipes-qt/qt5/qtjsbackend-native_4.999+git.bb @@ -1,5 +1,6 @@ -SRCREV = "89c7e60ca70d0ff8f26f311fa92b8109d275f6f9" +SRCREV = "b41c2151fdfca3f63a6cd45f6c69ae678694b63e" SRC_URI += "git://gitorious.org/qt/qtjsbackend.git;protocol=git" + S = "${WORKDIR}/git" require qtjsbackend-native.inc diff --git a/recipes-qt/qt5/qtjsbackend.inc b/recipes-qt/qt5/qtjsbackend.inc index 8b8374b5c0..c9a5db913f 100644 --- a/recipes-qt/qt5/qtjsbackend.inc +++ b/recipes-qt/qt5/qtjsbackend.inc @@ -8,7 +8,7 @@ INC_PR = "r0" inherit qmake5 SRC_URI += " \ - file://qmake.conf \ + file://module_qmake.conf \ file://0002-Make-sure-that-we-pick-up-the-mkv8snapshot-tool.patch \ " @@ -24,7 +24,7 @@ do_configure () { # This should not be needed. Perhaps the lack of this file is an indication # of an error on the native recipe... - cp ${WORKDIR}/qmake.conf ${S}/.qmake.conf + cp ${WORKDIR}/module_qmake.conf ${S}/.qmake.conf ${OE_QMAKE_QMAKE} -r -d } diff --git a/recipes-qt/qt5/qtjsbackend/qmake.conf b/recipes-qt/qt5/qtjsbackend/qmake.conf deleted file mode 100644 index 42ba8e45fb..0000000000 --- a/recipes-qt/qt5/qtjsbackend/qmake.conf +++ /dev/null @@ -1 +0,0 @@ -load(qt_build_config) diff --git a/recipes-qt/qt5/qtjsbackend_4.999+git.bb b/recipes-qt/qt5/qtjsbackend_4.999+git.bb index 2e83249a7d..de19fb3182 100644 --- a/recipes-qt/qt5/qtjsbackend_4.999+git.bb +++ b/recipes-qt/qt5/qtjsbackend_4.999+git.bb @@ -1,4 +1,4 @@ -SRCREV = "89c7e60ca70d0ff8f26f311fa92b8109d275f6f9" +SRCREV = "b41c2151fdfca3f63a6cd45f6c69ae678694b63e" SRC_URI += "git://gitorious.org/qt/qtjsbackend.git;protocol=git" S = "${WORKDIR}/git"