diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2018-12-17 16:35:55 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2018-12-18 14:01:13 +0000 |
| commit | a143fbcac5a77cf03ca9f11eea9cbb95132b35cd (patch) | |
| tree | ccb2a6ab15f9fd87a826e03dc3628256cadd9cee /meta-boot2qt/classes/populate_b2qt_qt5_sdk.bbclass | |
| parent | 9ee5a7fcf774d07862fdc18c5fc11c6d88bad9a8 (diff) | |
| download | meta-boot2qt-a143fbcac5a77cf03ca9f11eea9cbb95132b35cd.tar.gz | |
Use ABI flavor with QtCreator
QtCreator 4.8 allows adding new ABI flavors that can be used
to differentiate otherwise identical tools. Using our own abi
flavor prevents QtCreator from mixing incompatible tools with
one from yocto toolchain.
Task-number: QTAUTO-793
Change-Id: Ibba6e42b25e404aff2a20a021fe7833455f0de9b
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Diffstat (limited to 'meta-boot2qt/classes/populate_b2qt_qt5_sdk.bbclass')
| -rw-r--r-- | meta-boot2qt/classes/populate_b2qt_qt5_sdk.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-boot2qt/classes/populate_b2qt_qt5_sdk.bbclass b/meta-boot2qt/classes/populate_b2qt_qt5_sdk.bbclass index f35ebfe..6278d11 100644 --- a/meta-boot2qt/classes/populate_b2qt_qt5_sdk.bbclass +++ b/meta-boot2qt/classes/populate_b2qt_qt5_sdk.bbclass | |||
| @@ -91,7 +91,7 @@ create_qtcreator_configure_script () { | |||
| 91 | # add qtcreator configuration script | 91 | # add qtcreator configuration script |
| 92 | install -m 0755 ${B2QTBASE}/files/configure-qtcreator.sh ${SDK_OUTPUT}/${SDKPATH} | 92 | install -m 0755 ${B2QTBASE}/files/configure-qtcreator.sh ${SDK_OUTPUT}/${SDKPATH} |
| 93 | sed -i -e '/^CONFIG=/c\CONFIG="${SDKPATH}/environment-setup-${REAL_MULTIMACH_TARGET_SYS}"' ${SDK_OUTPUT}/${SDKPATH}/configure-qtcreator.sh | 93 | sed -i -e '/^CONFIG=/c\CONFIG="${SDKPATH}/environment-setup-${REAL_MULTIMACH_TARGET_SYS}"' ${SDK_OUTPUT}/${SDKPATH}/configure-qtcreator.sh |
| 94 | sed -i -e '/^ABI=/c\ABI="${ABI}-linux-generic-elf-${SITEINFO_BITS}bit"' ${SDK_OUTPUT}/${SDKPATH}/configure-qtcreator.sh | 94 | sed -i -e '/^ABI=/c\ABI="${ABI}-linux-poky-elf-${SITEINFO_BITS}bit"' ${SDK_OUTPUT}/${SDKPATH}/configure-qtcreator.sh |
| 95 | } | 95 | } |
| 96 | 96 | ||
| 97 | create_qtcreator_configure_script_sdkmingw32 () { | 97 | create_qtcreator_configure_script_sdkmingw32 () { |