diff options
| author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-03-17 13:33:36 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-03-17 13:33:42 +0200 |
| commit | 7bb3b2abfdfe21c2005395a64bbe678067019fde (patch) | |
| tree | 33d1b0a0007936d03fdd04dad21ffa2ff5dcc311 /classes | |
| parent | 69074fbee24ecfcaf304cfcb07cadf78b3ec2cda (diff) | |
| parent | bea48bd0716cc8c60d4e3b3ddb497555f1905b33 (diff) | |
| download | meta-boot2qt-7bb3b2abfdfe21c2005395a64bbe678067019fde.tar.gz | |
Merge remote-tracking branch 'origin/fido' into dev
* origin/fido:
qt5: remove duplicate --sysroot from sdk mkspec
colibri-imx6: don't pull in old gstreamer
Specify source revision separately
Disable ethernet over usb on SMARC-sAMX6i
Change-Id: Ic14fccc65d7d30c8400f8fc09bf127fef187bc86
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/populate_b2qt_qt5_sdk.bbclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/classes/populate_b2qt_qt5_sdk.bbclass b/classes/populate_b2qt_qt5_sdk.bbclass index 5f45b05..d6b2b10 100644 --- a/classes/populate_b2qt_qt5_sdk.bbclass +++ b/classes/populate_b2qt_qt5_sdk.bbclass | |||
| @@ -49,9 +49,9 @@ EOF | |||
| 49 | done | 49 | done |
| 50 | echo "MACHINE = ${MACHINE}" > ${SDK_DEVICE_PRI} | 50 | echo "MACHINE = ${MACHINE}" > ${SDK_DEVICE_PRI} |
| 51 | echo "CROSS_COMPILE = \$\$[QT_HOST_PREFIX]${bindir_nativesdk}/${TARGET_SYS}/${TARGET_PREFIX}" >> ${SDK_DEVICE_PRI} | 51 | echo "CROSS_COMPILE = \$\$[QT_HOST_PREFIX]${bindir_nativesdk}/${TARGET_SYS}/${TARGET_PREFIX}" >> ${SDK_DEVICE_PRI} |
| 52 | echo "QMAKE_CFLAGS *= ${TARGET_CC_ARCH} --sysroot=\$\$[QT_SYSROOT] ${static_cflags}" >> ${SDK_DEVICE_PRI} | 52 | echo "QMAKE_CFLAGS *= ${TARGET_CC_ARCH} ${static_cflags}" >> ${SDK_DEVICE_PRI} |
| 53 | echo "QMAKE_CXXFLAGS *= ${TARGET_CC_ARCH} --sysroot=\$\$[QT_SYSROOT] ${static_cxxflags}" >> ${SDK_DEVICE_PRI} | 53 | echo "QMAKE_CXXFLAGS *= ${TARGET_CC_ARCH} ${static_cxxflags}" >> ${SDK_DEVICE_PRI} |
| 54 | echo "QMAKE_LFLAGS *= ${TARGET_CC_ARCH} --sysroot=\$\$[QT_SYSROOT] ${TARGET_LDFLAGS}" >> ${SDK_DEVICE_PRI} | 54 | echo "QMAKE_LFLAGS *= ${TARGET_CC_ARCH} ${TARGET_LDFLAGS}" >> ${SDK_DEVICE_PRI} |
| 55 | 55 | ||
| 56 | # Setup qt.conf to point at the device mkspec by default | 56 | # Setup qt.conf to point at the device mkspec by default |
| 57 | qtconf=${SDK_OUTPUT}/${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS}/qt.conf | 57 | qtconf=${SDK_OUTPUT}/${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS}/qt.conf |