From d8f60fdd7200971279a0d2417ddddf30603c99ba Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 18 Jan 2017 16:25:49 +0200 Subject: qtquickcompiler: include dependency libs for mingw Windows version of qtquickcompiler requires additional mingw libraries, that are not built in yocto. Include those from prebuilt package used also by Qt desktop packages in Windows. Task-number: QTBUG-58256 Change-Id: Id27d2267c43e562c089614498e33bd454e649ebc Reviewed-by: Mikko Gronoff --- recipes-qt/qt5-addons/qtquickcompiler-sdk.bb | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/recipes-qt/qt5-addons/qtquickcompiler-sdk.bb b/recipes-qt/qt5-addons/qtquickcompiler-sdk.bb index 47db6ca..94f4935 100644 --- a/recipes-qt/qt5-addons/qtquickcompiler-sdk.bb +++ b/recipes-qt/qt5-addons/qtquickcompiler-sdk.bb @@ -33,11 +33,12 @@ LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b" inherit allarch qmake5_paths -DEPENDS = "qtbase" +SRC_URI = "http://download.qt.io/development_releases/prebuilt/mingw_32/i686-4.9.2-release-posix-dwarf-rt_v3-rev1-runtime.7z" -S = "${WORKDIR}" +SRC_URI[md5sum] = "a7d673c4ad8bcef9e464ea5386492cb3" +SRC_URI[sha256sum] = "f7e58b0fb1f5aa4c23eefdc60abb88cb642eaa272fb741dca23068c70ca86542" -QT_VERSION = "5.6" +S = "${WORKDIR}" NATIVESDK_BINARY = "qtquickcompiler" NATIVESDK_BINARY_mingw32 = "qtquickcompiler.exe" @@ -57,6 +58,13 @@ do_install() { fi } +do_install_append_mingw32() { + if [ "${PN}" = "nativesdk-qtquickcompiler-sdk" ]; then + install -m 0644 ${WORKDIR}/libgcc_s_dw2-1.dll ${D}${OE_QMAKE_PATH_BINS} + install -m 0644 ${WORKDIR}/libwinpthread-1.dll ${D}${OE_QMAKE_PATH_BINS} + fi +} + INHIBIT_PACKAGE_STRIP = "1" ALLOW_EMPTY_${PN} = "1" PACKAGES =+ "${PN}-tools" -- cgit v1.2.3-54-g00ecf