diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-01-29 12:48:12 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-01-29 12:52:10 +0200 |
| commit | a358108b09762390ec951f560540bb99aaf9f2a2 (patch) | |
| tree | 6d9e6c078f46403bb2e76a25f4aa56c990c23083 /recipes-qt/qt5/qtwayland_git.bb | |
| parent | c32de2f746d944f515e9e47dd330dfb64b3ca280 (diff) | |
| parent | ce766374432309b85fdcfe8ef287dbb2ef11b337 (diff) | |
| download | meta-qt5-a358108b09762390ec951f560540bb99aaf9f2a2.tar.gz | |
Merge remote-tracking branch 'qtyocto/upstream/master' into 5.10
* qtyocto/upstream/master:
qt: refresh remaining patches and tags in meta-qt5 repos
qtwebengine: explicitly depend on bison-native
qtmqtt: add recipe
qtbase: fix a regression
qtbase: introduce QT_EDITION
packagegroup-qt5-qtcreator-debug: remove qtdeclarative-plugins
Conflicts:
recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch
recipes-qt/qt5/qtquickcontrols_git.bb
recipes-qt/qt5/qtserialbus_git.bb
Task-number: QTBUG-65164
Change-Id: Ifdb2bba80e68de28ec818fff2b2716645eb4d9c5
Diffstat (limited to 'recipes-qt/qt5/qtwayland_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtwayland_git.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 46ae8378..b5ffa1cc 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb | |||
| @@ -39,8 +39,8 @@ EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | |||
| 39 | 39 | ||
| 40 | SRCREV = "06230d22488796d92ea130e985d1e0ee2ed05199" | 40 | SRCREV = "06230d22488796d92ea130e985d1e0ee2ed05199" |
| 41 | 41 | ||
| 42 | # Patches from https://github.com/meta-qt5/qtwayland/commits/b5.9 | 42 | # Patches from https://github.com/meta-qt5/qtwayland/commits/b5.10 |
| 43 | # 5.9.meta-qt5.2 | 43 | # 5.10.meta-qt5.1 |
| 44 | # From https://bugreports.qt.io/browse/QTBUG-57767 | 44 | # From https://bugreports.qt.io/browse/QTBUG-57767 |
| 45 | SRC_URI += " \ | 45 | SRC_URI += " \ |
| 46 | file://0001-fix-build-without-xkbcommon-evdev.patch \ | 46 | file://0001-fix-build-without-xkbcommon-evdev.patch \ |