diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-02-22 11:47:15 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-02-22 11:48:47 +0200 |
| commit | 551f670b681294d15f4f36433c8507d99e240fd0 (patch) | |
| tree | e013fee1fe7d3f22fefbf627953c5aed45361715 /classes/populate_sdk_qt5.bbclass | |
| parent | d1ddf0cc4482b8e8e46f3be66870778ba9a42a13 (diff) | |
| parent | ee301d84a763f9a23499533ecd7cef20643b9431 (diff) | |
| download | meta-qt5-551f670b681294d15f4f36433c8507d99e240fd0.tar.gz | |
Merge remote-tracking branch 'qtyocto/upstream/master' into 5.9
* upstream/master:
populate_sdk_qt5: use _append operator
qmake5_base.bbclass: set qt.conf by environment variable again
Conflicts:
recipes-qt/qt5/nativesdk-qtbase_git.bb
recipes-qt/qt5/qtbase-native_git.bb
recipes-qt/qt5/qtbase_git.bb
Change-Id: I8f47b06f1143be1a399ab4e8d2aa9cf32df4ad25
Diffstat (limited to 'classes/populate_sdk_qt5.bbclass')
| -rw-r--r-- | classes/populate_sdk_qt5.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/classes/populate_sdk_qt5.bbclass b/classes/populate_sdk_qt5.bbclass index bbf137d7..a10341dc 100644 --- a/classes/populate_sdk_qt5.bbclass +++ b/classes/populate_sdk_qt5.bbclass | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | 2 | ||
| 3 | inherit populate_sdk_qt5_base | 3 | inherit populate_sdk_qt5_base |
| 4 | 4 | ||
| 5 | TOOLCHAIN_HOST_TASK += "nativesdk-packagegroup-qt5-toolchain-host" | 5 | TOOLCHAIN_HOST_TASK_append = " nativesdk-packagegroup-qt5-toolchain-host" |
| 6 | TOOLCHAIN_TARGET_TASK += "packagegroup-qt5-toolchain-target" | 6 | TOOLCHAIN_TARGET_TASK_append = " packagegroup-qt5-toolchain-target" |
| 7 | 7 | ||
| 8 | FEATURE_PACKAGES_qtcreator-debug = "packagegroup-qt5-qtcreator-debug" | 8 | FEATURE_PACKAGES_qtcreator-debug = "packagegroup-qt5-qtcreator-debug" |