diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-02-22 14:50:03 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-04-06 12:44:47 +0000 |
commit | 9ed1897bf7520db9fa93e8aa3508994472804569 (patch) | |
tree | 8bca0963b9d120c43b4a793b1cc5f8f3fffb3c35 /recipes-qt/qt5/qtwebkit-examples_git.bb | |
parent | f69baf2a72b224fafad89a1422b692fb95ec439b (diff) | |
download | meta-qt5-9ed1897bf7520db9fa93e8aa3508994472804569.tar.gz |
qt5-git.inc: drop nobranch=1
* sneaked in with:
commit 333949a8239dfa7788b35f1059614733e11a6a25
Author: Samuli Piippo <samuli.piippo@qt.io>
Date: Thu Jan 26 16:54:50 2017 +0200
Upgrade to Qt 5.8
* use 5.10.1 branch by defaut and fix QT_MODULE_BRANCH
in qtknx, qtmqtt, qtwebkit-examples, qtwebkit which don't
have 5.10.1 branch at all
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebkit-examples_git.bb')
-rw-r--r-- | recipes-qt/qt5/qtwebkit-examples_git.bb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebkit-examples_git.bb b/recipes-qt/qt5/qtwebkit-examples_git.bb index 3e3e4a0b..114fab7a 100644 --- a/recipes-qt/qt5/qtwebkit-examples_git.bb +++ b/recipes-qt/qt5/qtwebkit-examples_git.bb | |||
@@ -17,4 +17,6 @@ DEPENDS += "qtwebkit qtxmlpatterns" | |||
17 | RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins" | 17 | RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins" |
18 | RDEPENDS_${PN}-examples += "${@bb.utils.contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}" | 18 | RDEPENDS_${PN}-examples += "${@bb.utils.contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}" |
19 | 19 | ||
20 | QT_MODULE_BRANCH = "5.9" | ||
21 | |||
20 | SRCREV = "a24c780b60d7d8bc00c4a48042cf7f32db777d55" | 22 | SRCREV = "a24c780b60d7d8bc00c4a48042cf7f32db777d55" |