summaryrefslogtreecommitdiffstats
path: root/meta-renesas-extras/recipes/qt5
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2016-12-01 17:05:58 +0200
committerSamuli Piippo <samuli.piippo@qt.io>2016-12-09 12:46:24 +0000
commit2e5f9797fed62516808cb52c0e579726c785c5e7 (patch)
treefc4996ddbeeee137123ccb9f0f2afce8f4f314cd /meta-renesas-extras/recipes/qt5
parent6473d7afc408b8e3ca5448bcb25cb1395faa588e (diff)
downloadmeta-boot2qt-2e5f9797fed62516808cb52c0e579726c785c5e7.tar.gz
qt5: update submodules
Needs updates for meta-qt5 and meta-mingw Temporarily disable QtQuickCompiler (QTRD-2219) Change-Id: I089e4b4ce56030a37ee42324c13d43bade492bf3 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Diffstat (limited to 'meta-renesas-extras/recipes/qt5')
-rw-r--r--meta-renesas-extras/recipes/qt5/qt3d/0001-Remove-qgltf.patch11
1 files changed, 4 insertions, 7 deletions
diff --git a/meta-renesas-extras/recipes/qt5/qt3d/0001-Remove-qgltf.patch b/meta-renesas-extras/recipes/qt5/qt3d/0001-Remove-qgltf.patch
index 48a4085..af414ad 100644
--- a/meta-renesas-extras/recipes/qt5/qt3d/0001-Remove-qgltf.patch
+++ b/meta-renesas-extras/recipes/qt5/qt3d/0001-Remove-qgltf.patch
@@ -1,4 +1,4 @@
1From 49a04f4faa135fa6ef56fc35dfb9dfe55ff2a3c4 Mon Sep 17 00:00:00 2001 1From 9966e10f36876daa910ce301a175633771470e82 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@theqtcompany.com> 2From: Samuli Piippo <samuli.piippo@theqtcompany.com>
3Date: Wed, 18 Nov 2015 10:14:18 +0200 3Date: Wed, 18 Nov 2015 10:14:18 +0200
4Subject: [PATCH] Remove qgltf 4Subject: [PATCH] Remove qgltf
@@ -12,14 +12,11 @@ Task-number: QTBUG-49153
12 1 file changed, 1 insertion(+), 1 deletion(-) 12 1 file changed, 1 insertion(+), 1 deletion(-)
13 13
14diff --git a/tools/tools.pro b/tools/tools.pro 14diff --git a/tools/tools.pro b/tools/tools.pro
15index 055f412..c1eba7f 100644 15index 09c7d8e..8f093ce 100644
16--- a/tools/tools.pro 16--- a/tools/tools.pro
17+++ b/tools/tools.pro 17+++ b/tools/tools.pro
18@@ -1,3 +1,3 @@ 18@@ -1,3 +1,3 @@
19 TEMPLATE = subdirs 19 TEMPLATE = subdirs
20-SUBDIRS = qgltf 20-!android:SUBDIRS += qgltf
21+#SUBDIRS = qgltf 21+#!android:SUBDIRS += qgltf
22 qgltf.CONFIG += host_build 22 qgltf.CONFIG += host_build
23--
241.9.1
25