diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-01-11 09:27:20 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-01-11 09:28:01 +0200 |
| commit | 75e93a6ecb121d9aa0ee4aa986b3eef0dd20ea22 (patch) | |
| tree | 9c50c69852153a629d6507925c198ab09502ee4d /meta-boot2qt/classes/populate_b2qt_qt5_sdk.bbclass | |
| parent | ff68de7e1d41b2cd81b0ffd16759d2c738554705 (diff) | |
| parent | b97117dfe83a5b73e8d27c6818902e0d1cfca7ba (diff) | |
| download | meta-boot2qt-75e93a6ecb121d9aa0ee4aa986b3eef0dd20ea22.tar.gz | |
Merge remote-tracking branch 'origin/QtAS-5.12.0' into sumo
* origin/QtAS-5.12.0:
b97117d automotive: update revisions
4281e5b automotive: update revisions
b344daf automotive: update neptune 3 revision
a143fbc Use ABI flavor with QtCreator
9ee5a7f QBSP: add correct cmake generator for windows toolchain
8fcf3a1 meta-qt5: update revision
0385367 Merge commit 'origin/sumo' into QtAS-5.12.0
9a57170 automotive: update revisions
Conflicts:
scripts/manifest.xml
Change-Id: I3064a526fd7861ea1aa0ec9b42c016c74dbc23eb
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 () { |