diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2016-05-05 12:24:20 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-05-05 18:27:52 +0300 |
commit | d0266a92febaf578c4d940a97ca1f844af8384d5 (patch) | |
tree | 04f035ff57d02a7b2eb9d25b8dc6b3eca37c0f63 /recipes-qt/qt5/qtwayland-native_git.bb | |
parent | 46817620916ed6d8b8f07c720f29d1faa73eafae (diff) | |
parent | 802b395222054f39501f1e02879d5c708b3da8d9 (diff) |
Merge remote-tracking branch 'meta-qt5/master' into master-mingw
* meta-qt5/master:
replace base_contains by bb.utils.contains
qt5: upgrade to latest revision in 5.6 branch
qt5: set SRCREVs,PVs to 5.6.0
qtquickcontrols: fix compilation of examples/texteditor
qtdeclarative: fix compilation of examples/qquickviewcomparison
quazip: update to 0.7.2
qtquickcontrols2: initial add 5.6.0
qmake5_base: use remove-libtool bbclass
recipes: use new PACKAGECONFIG_CONFARGS instead of EXTRA_OECONF
Conflicts:
classes/qmake5_base.bbclass
recipes-qt/qt5/nativesdk-qtbase_git.bb
recipes-qt/qt5/qt3d_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/0010-Add-external-hostbindir-option-for-native-sdk.patch
recipes-qt/qt5/qtbase_git.bb
recipes-qt/qt5/qtconnectivity_git.bb
recipes-qt/qt5/qtdeclarative_git.bb
recipes-qt/qt5/qtenginio_git.bb
recipes-qt/qt5/qtlocation_git.bb
recipes-qt/qt5/qtmultimedia_git.bb
recipes-qt/qt5/qtquick1_git.bb
recipes-qt/qt5/qtquickcontrols_git.bb
recipes-qt/qt5/qtsvg_git.bb
recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch
recipes-qt/qt5/qttools_git.bb
recipes-qt/qt5/qttranslations_git.bb
recipes-qt/qt5/qtwayland-native_git.bb
recipes-qt/qt5/qtwayland_git.bb
recipes-qt/qt5/qtwebengine_git.bb
recipes-qt/qt5/qtwebkit_git.bb
recipes-qt/qt5/qtwebsockets_git.bb
recipes-qt/qt5/qtxmlpatterns_git.bb
Change-Id: I703197bf7b3802fa22d48a7c9eb04cfa25657c9f
Diffstat (limited to 'recipes-qt/qt5/qtwayland-native_git.bb')
-rw-r--r-- | recipes-qt/qt5/qtwayland-native_git.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qtwayland-native_git.bb b/recipes-qt/qt5/qtwayland-native_git.bb index 21827d74..1fd51685 100644 --- a/recipes-qt/qt5/qtwayland-native_git.bb +++ b/recipes-qt/qt5/qtwayland-native_git.bb @@ -25,4 +25,4 @@ do_install() { oe_runmake install INSTALL_ROOT=${D} } -SRCREV = "b94be41409a6dfa58d8b3ae8413c6930e76fc040" +SRCREV = "26e27845a43319d0ecad0c6392f05d1ed50da2a2" |