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 /recipes-qt/qt5/qtwebengine_git.bb | |
| 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 'recipes-qt/qt5/qtwebengine_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtwebengine_git.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 0ee37593..dffb9d3f 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
| @@ -78,7 +78,7 @@ do_configure() { | |||
| 78 | 78 | ||
| 79 | # qmake can't find the OE_QMAKE_* variables on it's own so directly passing them as | 79 | # qmake can't find the OE_QMAKE_* variables on it's own so directly passing them as |
| 80 | # arguments here | 80 | # arguments here |
| 81 | ${OE_QMAKE_QMAKE} ${OE_QMAKE_QTCONF} -r ${EXTRA_QMAKEVARS_PRE} ${S} \ | 81 | ${OE_QMAKE_QMAKE} -r ${EXTRA_QMAKEVARS_PRE} ${S} \ |
| 82 | QMAKE_CXX="${OE_QMAKE_CXX}" QMAKE_CC="${OE_QMAKE_CC}" \ | 82 | QMAKE_CXX="${OE_QMAKE_CXX}" QMAKE_CC="${OE_QMAKE_CC}" \ |
| 83 | QMAKE_LINK="${OE_QMAKE_LINK}" \ | 83 | QMAKE_LINK="${OE_QMAKE_LINK}" \ |
| 84 | QMAKE_CFLAGS="${OE_QMAKE_CFLAGS}" \ | 84 | QMAKE_CFLAGS="${OE_QMAKE_CFLAGS}" \ |