diff options
author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-11-18 10:32:33 +0200 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-11-19 06:49:30 +0000 |
commit | 7f4374e0451cf3cc4101d675139372184a10a204 (patch) | |
tree | 0582bcd1a448986b02eef785ed7802c1d87429fe /recipes-qt/qt5 | |
parent | 679567dfdc6709417f57f0497252a4315d9b3a19 (diff) | |
download | meta-boot2qt-7f4374e0451cf3cc4101d675139372184a10a204.tar.gz |
qt5: upgrade to Qt 5.6
Move to latest revision of meta-qt5 that pulls in Qt 5.6.
- Qt Quick Compiler needs follow 5.6 branch.
- Disable compilation of qgltf host toool from Qt3D, that does not
compile with GCC 4.9.1
Change-Id: Idf0437cff1debf6db558959b357dae3279466163
Reviewed-by: Gatis Paeglis <gatis.paeglis@theqtcompany.com>
Diffstat (limited to 'recipes-qt/qt5')
-rw-r--r-- | recipes-qt/qt5/qt3d/0001-Remove-qgltf.patch | 25 | ||||
-rw-r--r-- | recipes-qt/qt5/qt3d_git.bbappend | 27 |
2 files changed, 52 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qt3d/0001-Remove-qgltf.patch b/recipes-qt/qt5/qt3d/0001-Remove-qgltf.patch new file mode 100644 index 0000000..48a4085 --- /dev/null +++ b/recipes-qt/qt5/qt3d/0001-Remove-qgltf.patch | |||
@@ -0,0 +1,25 @@ | |||
1 | From 49a04f4faa135fa6ef56fc35dfb9dfe55ff2a3c4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Samuli Piippo <samuli.piippo@theqtcompany.com> | ||
3 | Date: Wed, 18 Nov 2015 10:14:18 +0200 | ||
4 | Subject: [PATCH] Remove qgltf | ||
5 | |||
6 | assimp does not compile for ARM because of GCC bug | ||
7 | (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66964) | ||
8 | |||
9 | Task-number: QTBUG-49153 | ||
10 | --- | ||
11 | tools/tools.pro | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/tools/tools.pro b/tools/tools.pro | ||
15 | index 055f412..c1eba7f 100644 | ||
16 | --- a/tools/tools.pro | ||
17 | +++ b/tools/tools.pro | ||
18 | @@ -1,3 +1,3 @@ | ||
19 | TEMPLATE = subdirs | ||
20 | -SUBDIRS = qgltf | ||
21 | +#SUBDIRS = qgltf | ||
22 | qgltf.CONFIG += host_build | ||
23 | -- | ||
24 | 1.9.1 | ||
25 | |||
diff --git a/recipes-qt/qt5/qt3d_git.bbappend b/recipes-qt/qt5/qt3d_git.bbappend new file mode 100644 index 0000000..c7fa766 --- /dev/null +++ b/recipes-qt/qt5/qt3d_git.bbappend | |||
@@ -0,0 +1,27 @@ | |||
1 | ############################################################################# | ||
2 | ## | ||
3 | ## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). | ||
4 | ## | ||
5 | ## This file is part of the Qt Enterprise Embedded Scripts of the Qt | ||
6 | ## framework. | ||
7 | ## | ||
8 | ## $QT_BEGIN_LICENSE$ | ||
9 | ## Commercial License Usage Only | ||
10 | ## Licensees holding valid commercial Qt license agreements with Digia | ||
11 | ## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, | ||
12 | ## may use this file in accordance with the terms contained in said license | ||
13 | ## agreement. | ||
14 | ## | ||
15 | ## For further information use the contact form at | ||
16 | ## http://www.qt.io/contact-us. | ||
17 | ## | ||
18 | ## | ||
19 | ## $QT_END_LICENSE$ | ||
20 | ## | ||
21 | ############################################################################# | ||
22 | |||
23 | FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" | ||
24 | |||
25 | SRC_URI += " \ | ||
26 | file://0001-Remove-qgltf.patch \ | ||
27 | " | ||