diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-02-15 13:15:26 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-03-01 13:05:23 +0200 |
| commit | a96836aedf30d2e26fbcafc13b1313d1325a0730 (patch) | |
| tree | d525675103a4ddc88c25c2303b509f71bd447f32 /recipes-qt/qt5/qt5-git.inc | |
| parent | e721e84659869e4a04838d95d7cdbab9d48f5c3d (diff) | |
| parent | db881bb4917628ad3eb1fa7c4f27915cf2ae60f4 (diff) | |
| download | meta-qt5-a96836aedf30d2e26fbcafc13b1313d1325a0730.tar.gz | |
Merge remote-tracking branch 'qtyocto/upstream/rocko' into 5.9
* qtyocto/upstream/rocko:
qwt-qt5: rewrite completely
qt5: upgrade to 5.9.4
qt: refresh remaining patches and tags in meta-qt5 repos
qtwebengine: explicitly depend on bison-native
qtlocation: correct PACKAGECONFIG for mapboxgl
gstreamer1.0-plugins-bad: add expansion parameter
Bump to Qt 5.9.3
Conflicts:
recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch
recipes-qt/qt5/qtquickcontrols_git.bb
recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch
recipes-qt/qt5/qtwayland_git.bb
Change-Id: I1a9a35640f301f60d8363d4c3a6bb226ea40c2d1
Diffstat (limited to 'recipes-qt/qt5/qt5-git.inc')
| -rw-r--r-- | recipes-qt/qt5/qt5-git.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index 29645b19..44f8d71a 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-2017 Martin Jansa <martin.jansa@gmail.com> | 2 | # Copyright (C) 2013-2018 Martin Jansa <martin.jansa@gmail.com> |
| 3 | 3 | ||
| 4 | QT_MODULE ?= "${BPN}" | 4 | QT_MODULE ?= "${BPN}" |
| 5 | QT_MODULE_BRANCH ?= "5.9" | 5 | QT_MODULE_BRANCH ?= "5.9" |