diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2016-12-01 17:05:58 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-12-09 12:46:24 +0000 |
| commit | 6c228e1efc3c66d59e777784606cb005730b09e5 (patch) | |
| tree | 8bbff9477ae6c42db6c0590dcd329be7cacab963 | |
| parent | 0ee5cad6efa631dd690606630a17ef44052b2f14 (diff) | |
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>
| -rw-r--r-- | recipes/qt5/qt3d/0001-Remove-qgltf.patch | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/recipes/qt5/qt3d/0001-Remove-qgltf.patch b/recipes/qt5/qt3d/0001-Remove-qgltf.patch index 48a4085..af414ad 100644 --- a/recipes/qt5/qt3d/0001-Remove-qgltf.patch +++ b/recipes/qt5/qt3d/0001-Remove-qgltf.patch @@ -1,4 +1,4 @@ -From 49a04f4faa135fa6ef56fc35dfb9dfe55ff2a3c4 Mon Sep 17 00:00:00 2001 +From 9966e10f36876daa910ce301a175633771470e82 Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@theqtcompany.com> Date: Wed, 18 Nov 2015 10:14:18 +0200 Subject: [PATCH] Remove qgltf @@ -12,14 +12,11 @@ Task-number: QTBUG-49153 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/tools.pro b/tools/tools.pro -index 055f412..c1eba7f 100644 +index 09c7d8e..8f093ce 100644 --- a/tools/tools.pro +++ b/tools/tools.pro @@ -1,3 +1,3 @@ TEMPLATE = subdirs --SUBDIRS = qgltf -+#SUBDIRS = qgltf +-!android:SUBDIRS += qgltf ++#!android:SUBDIRS += qgltf qgltf.CONFIG += host_build --- -1.9.1 - |