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/qtgamepad_git.bb | |
| parent | d1ddf0cc4482b8e8e46f3be66870778ba9a42a13 (diff) | |
| parent | ee301d84a763f9a23499533ecd7cef20643b9431 (diff) | |
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/qtgamepad_git.bb')
0 files changed, 0 insertions, 0 deletions