diff options
| author | Kai Kang <kai.kang@windriver.com> | 2015-06-02 09:52:57 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-08 17:34:02 +0100 |
| commit | ba93bdd38dad2146e40d42f8cd20dc7a755529dc (patch) | |
| tree | f3aa3d5f31b6833c0d2e4698811d6405788164d3 /meta/recipes-qt/qt4/qt4-x11-free.inc | |
| parent | 20a3a36547831349d5d8b429cb35f1415a856bda (diff) | |
| download | poky-ba93bdd38dad2146e40d42f8cd20dc7a755529dc.tar.gz | |
qt4: upgrade to 4.8.7
Upgrade qt4 packages from version 4.8.6 to 4.8.7.
* remove arm64 related patches which are merged
* remove 0034-Fix-a-division-by-zero-when-processing-malformed-BMP.patch
which is backported.
* update 0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch
and 0013-configure-add-crossarch-option.patch for new version
* remove useless variable INC_PR
(From OE-Core rev: 4d033fdc5e754e22edb2e9074e30e58847c4b791)
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-x11-free.inc')
| -rw-r--r-- | meta/recipes-qt/qt4/qt4-x11-free.inc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc index 835fc966f5..f6a1737395 100644 --- a/meta/recipes-qt/qt4/qt4-x11-free.inc +++ b/meta/recipes-qt/qt4/qt4-x11-free.inc | |||
| @@ -9,8 +9,6 @@ DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', ' | |||
| 9 | PROVIDES += "qt4-x11" | 9 | PROVIDES += "qt4-x11" |
| 10 | QT4DEPENDS = "" | 10 | QT4DEPENDS = "" |
| 11 | 11 | ||
| 12 | INC_PR = "r50" | ||
| 13 | |||
| 14 | QT_GLFLAGS ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} " | 12 | QT_GLFLAGS ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} " |
| 15 | QT_GLFLAGS_qemux86 = "-opengl" | 13 | QT_GLFLAGS_qemux86 = "-opengl" |
| 16 | QT_GLFLAGS_qemuppc = "-opengl" | 14 | QT_GLFLAGS_qemuppc = "-opengl" |