t-head/meta-qt5
1
0
Fork 0
mirror of https://github.com/thead-yocto-mirror/meta-qt5 synced 2026-09-03 20:54:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

qt5-git.inc: drop nobranch=1

Browse Source 
* sneaked in with:
  commit 333949a823
  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>
This commit is contained in:
Martin Jansa
2018-02-22 14:50:03 +00:00
parent f69baf2a72
commit 9ed1897bf7
5 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
recipes-qt/qt5/qt5-git.inc
View File

@@ -1,9 +1,9 @@
# Copyright (C) 2012-2016 O.S. Systems Software LTDA.
# Copyright (C) 2013-2017 Martin Jansa <martin.jansa@gmail.com>
# Copyright (C) 2013-2018 Martin Jansa <martin.jansa@gmail.com>
QT_MODULE ?= "${BPN}"
QT_MODULE_BRANCH ?= "5.10"
QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH};nobranch=1"
QT_MODULE_BRANCH ?= "5.10.1"
QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}"
# each module needs to define valid SRCREV
SRC_URI = " \

2
recipes-qt/qt5/qtknx_git.bb
View File

@@ -9,4 +9,6 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase"
QT_MODULE_BRANCH = "5.10"
SRCREV = "29c34e8f072afd01002ed3847d752b4e065f977e"

2
recipes-qt/qt5/qtmqtt_git.bb
View File

@@ -9,4 +9,6 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase"
QT_MODULE_BRANCH = "5.10"
SRCREV = "2c3c2a41c55a179332ec2a076856990f36dd5ef9"

2
recipes-qt/qt5/qtwebkit-examples_git.bb
View File

@@ -17,4 +17,6 @@ DEPENDS += "qtwebkit qtxmlpatterns"
RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins"
RDEPENDS_${PN}-examples += "${@bb.utils.contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}"
QT_MODULE_BRANCH = "5.9"
SRCREV = "a24c780b60d7d8bc00c4a48042cf7f32db777d55"

2
recipes-qt/qt5/qtwebkit_git.bb
View File

@@ -87,4 +87,6 @@ PACKAGES_remove = "${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-db
RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }"
export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}"
QT_MODULE_BRANCH = "5.9"
SRCREV = "97c4a80a1282c8c3eaa343011286b76fd4838c5f"