diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2017-01-18 16:25:49 +0200 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2017-01-19 07:13:30 +0000 |
commit | d8f60fdd7200971279a0d2417ddddf30603c99ba (patch) | |
tree | 71d25c98d11d8015d6d48c39a143e96976ab1440 | |
parent | d5a2105b48cf0c3f5c1ad22c50354ee18fe91f88 (diff) | |
download | meta-boot2qt-d8f60fdd7200971279a0d2417ddddf30603c99ba.tar.gz |
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 <mikko.gronoff@qt.io>
-rw-r--r-- | recipes-qt/qt5-addons/qtquickcompiler-sdk.bb | 14 |
1 files 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" | |||
33 | 33 | ||
34 | inherit allarch qmake5_paths | 34 | inherit allarch qmake5_paths |
35 | 35 | ||
36 | DEPENDS = "qtbase" | 36 | SRC_URI = "http://download.qt.io/development_releases/prebuilt/mingw_32/i686-4.9.2-release-posix-dwarf-rt_v3-rev1-runtime.7z" |
37 | 37 | ||
38 | S = "${WORKDIR}" | 38 | SRC_URI[md5sum] = "a7d673c4ad8bcef9e464ea5386492cb3" |
39 | SRC_URI[sha256sum] = "f7e58b0fb1f5aa4c23eefdc60abb88cb642eaa272fb741dca23068c70ca86542" | ||
39 | 40 | ||
40 | QT_VERSION = "5.6" | 41 | S = "${WORKDIR}" |
41 | 42 | ||
42 | NATIVESDK_BINARY = "qtquickcompiler" | 43 | NATIVESDK_BINARY = "qtquickcompiler" |
43 | NATIVESDK_BINARY_mingw32 = "qtquickcompiler.exe" | 44 | NATIVESDK_BINARY_mingw32 = "qtquickcompiler.exe" |
@@ -57,6 +58,13 @@ do_install() { | |||
57 | fi | 58 | fi |
58 | } | 59 | } |
59 | 60 | ||
61 | do_install_append_mingw32() { | ||
62 | if [ "${PN}" = "nativesdk-qtquickcompiler-sdk" ]; then | ||
63 | install -m 0644 ${WORKDIR}/libgcc_s_dw2-1.dll ${D}${OE_QMAKE_PATH_BINS} | ||
64 | install -m 0644 ${WORKDIR}/libwinpthread-1.dll ${D}${OE_QMAKE_PATH_BINS} | ||
65 | fi | ||
66 | } | ||
67 | |||
60 | INHIBIT_PACKAGE_STRIP = "1" | 68 | INHIBIT_PACKAGE_STRIP = "1" |
61 | ALLOW_EMPTY_${PN} = "1" | 69 | ALLOW_EMPTY_${PN} = "1" |
62 | PACKAGES =+ "${PN}-tools" | 70 | PACKAGES =+ "${PN}-tools" |