diff options
| author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-02-03 16:55:58 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-02-03 16:56:36 +0200 |
| commit | 53f534748a7f5427ade4f9a11f8b5f91798d8ed6 (patch) | |
| tree | 97c2db6e7332e1064ccfb384732d8b96c37cbad0 /recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch | |
| parent | ff7fd3b1a9b39d217928f3e1d8f16341b9fd6fec (diff) | |
| parent | 4a0acfa4111600b7cb5ae7b16cd6bfa5df2e2123 (diff) | |
| download | meta-qt5-53f534748a7f5427ade4f9a11f8b5f91798d8ed6.tar.gz | |
Merge remote-tracking branch 'origin/upstream/master' into master-mingw
* origin/upstream/master:
qtbase: use PACKAGECONFIG to ensure runtime dependency to libssl
qtbase: re-enable replacing host paths in qconfig.pri
qt5: allow overriding git protocol used with QT_GIT uri
Conflicts:
recipes-qt/qt5/qtbase_git.bb
Change-Id: Id0b67b6a30807501628c8ebfb6503bbd1cba9ca5
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch')
0 files changed, 0 insertions, 0 deletions