diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-02-22 14:51:05 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-04-20 10:06:37 +0000 |
commit | f33be06035faaa59cee17e5a97e82d079b4ab444 (patch) | |
tree | 79d1a995808932b7e9fae144e2b13ddb0b4908a2 /recipes-qt/qt5/qt3d | |
parent | c7549747b6e83e9630ae37c7e2595e41e4f1ebac (diff) |
qt5: upgrade to 5.11 Alpha
* use qtwebkit and qtwebkit-examples from dev branch, because there is
no 5.11 branch (there isn't 5.10 as well, but because nobranch=1 in
qt5-git.inc nobody noticed).
* qtbase: drop qml-debug options
removed from qtbase in:
commit 525f8516c2580018f910cfb99ab5e0e36bd55ab1
Author: Ulf Hermann <ulf.hermann@qt.io>
Date: Fri Oct 6 16:27:09 2017 +0200
Subject: Remove qml-debug configure flag and feature
* qtgraphicaleffects, qtquickcontrols2, qtquickcontrols,
qtvirtualkeyboard: add qtdeclarative-native dependency
needed for qmlcachegen binary
* qtwebkit: update LIC_FILES_CHKSUM and remove PACKAGECONFIGs
referenced files disappered in:
commit 6882a04fb36642862b11efe514251d32070c3d65
Author: Konstantin Tokarev <annulen@yandex.ru>
Date: Thu Aug 25 19:20:41 2016 +0300
Subject: Imported QtWebKit TP3 (git b57bc6801f1876c3220d5a4bfea33d620d477443)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qt3d')
-rw-r--r-- | recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch | 8 | ||||
-rw-r--r-- | recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch index 66c80173..37093983 100644 --- a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch +++ b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch @@ -1,4 +1,4 @@ -From 05562960b7a3ed7753c9a39a7032fea873fc4098 Mon Sep 17 00:00:00 2001 +From cab5a0bcf52370fede85ee02896ce1a2979d6631 Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@theqtcompany.com> Date: Wed, 10 Feb 2016 09:02:09 +0200 Subject: [PATCH] Allow a tools-only build @@ -40,12 +40,12 @@ index 8ba2d9a..e973d93 100644 } else { include(assimp.pri) diff --git a/tools/tools.pro b/tools/tools.pro -index 8e973ae..ad51db5 100644 +index 64f2b9f..d108e7f 100644 --- a/tools/tools.pro +++ b/tools/tools.pro @@ -1,4 +1,4 @@ TEMPLATE = subdirs QT_FOR_CONFIG += 3dcore-private --!android:qtConfig(assimp):qtConfig(commandlineparser): \ -+!android:tools-only|qtConfig(assimp):qtConfig(commandlineparser): \ +-qtConfig(assimp):qtConfig(commandlineparser): \ ++tools-only|qtConfig(assimp):qtConfig(commandlineparser): \ SUBDIRS += qgltf diff --git a/recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch b/recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch index 3357fa3e..68b0f332 100644 --- a/recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch +++ b/recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch @@ -1,4 +1,4 @@ -From fc23039612ab9aed4f994b4390016e71ceee8165 Mon Sep 17 00:00:00 2001 +From d6e714f9c2b1e5ed238084e254268d70d2093ae1 Mon Sep 17 00:00:00 2001 From: Kim Kulling <kim.kulling@googlemail.com> Date: Mon, 7 Nov 2016 17:19:49 +0100 Subject: [PATCH] Fix BlenderDNA for clang cross compiler. |