summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qt5-git.inc
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2020-03-02 14:39:52 +0200
committerMikko Gronoff <mikko.gronoff@qt.io>2020-03-03 10:01:14 +0200
commitaf6cd54ed2b6d8834dbf09570dbe42460bd78b92 (patch)
treecbb55ca0f320d53b82c69b1afe063b675a20147a /recipes-qt/qt5/qt5-git.inc
parent2da972e58650f5d44f2cfd4fc1ec4e4dc1d2cd48 (diff)
parentf9a58d623762c5fd78bd6bc18d701a7aaa004567 (diff)
downloadmeta-qt5-af6cd54ed2b6d8834dbf09570dbe42460bd78b92.tar.gz
Merge "Merge remote-tracking branch 'qt/upstream/master' into 5.14"
Diffstat (limited to 'recipes-qt/qt5/qt5-git.inc')
-rw-r--r--recipes-qt/qt5/qt5-git.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc
index f13b231a..0d7e1683 100644
--- a/recipes-qt/qt5/qt5-git.inc
+++ b/recipes-qt/qt5/qt5-git.inc
@@ -1,5 +1,5 @@
1# Copyright (C) 2012-2016 O.S. Systems Software LTDA. 1# Copyright (C) 2012-2016 O.S. Systems Software LTDA.
2# Copyright (C) 2013-2019 Martin Jansa <martin.jansa@gmail.com> 2# Copyright (C) 2013-2020 Martin Jansa <martin.jansa@gmail.com>
3 3
4QT_MODULE ?= "${BPN}" 4QT_MODULE ?= "${BPN}"
5QT_MODULE_BRANCH ?= "5.14" 5QT_MODULE_BRANCH ?= "5.14"