diff options
| author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-02-29 09:15:43 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-02-29 11:26:05 +0200 |
| commit | 60c8b35f13f0969a2244e5ab06333fc3994ed221 (patch) | |
| tree | 9df5eef7ff4700a8d74a2a667d477ec458a63a48 /recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch | |
| parent | ddbe177dae46353f08f7326a11d3b3fd5a1f8435 (diff) | |
| parent | 26637f766a40fd59df6e1edc65e4b14cd2f78014 (diff) | |
| download | meta-qt5-60c8b35f13f0969a2244e5ab06333fc3994ed221.tar.gz | |
Merge remote-tracking branch 'meta-qt5/master' into master-mingw
* meta-qt5/master:
qtbase: add runtime dependency to xkeyboard-config
recipetool: add support for Qt5 to meta-qt5
libconnman-qt5: Blacklist because of connman-qt5.pc
qt5: skip libdir for ${PN}-dbg and dev-elf for ${PN}-examples-dev
qtbase: upgrade SRCREVs a bit more
nativesdk-qtbase: use runtime linked dbus
Conflicts:
recipes-qt/qt5/nativesdk-qtbase_git.bb
recipes-qt/qt5/qtbase-native_git.bb
recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch
recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch
recipes-qt/qt5/qtbase_git.bb
Change-Id: I51f42699487c82a5f0e9c52f5fd5c5bf4bd51eff
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch')
0 files changed, 0 insertions, 0 deletions