diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2019-07-03 15:01:08 +0300 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2019-07-15 13:58:40 +0000 |
commit | 8d2e1b401987d743ebdf964927c03f41e8f60328 (patch) | |
tree | d002364505c85ecb0a508dc359156c4444ffeaed /recipes-qt/qt5/qt3d | |
parent | 8da88b098fae46e13cd7cbaf8d65dd0e99b4e0e5 (diff) |
qt5: Upgrade to Qt 5.13.0
Update recipes for Qt 5.13.0, add new recipes for Qt modules qtcoap
and qtlottie, and remove qtcanvas3d.
Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qt3d')
-rw-r--r-- | recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch | 29 |
1 files changed, 16 insertions, 13 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 b1e662bc..05a86a70 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,26 +1,24 @@ -From 98509dbb66b3d93cdb6ca73cb5db537fa8ff8bd3 Mon Sep 17 00:00:00 2001 +From 1e64f9b509e6794c6f01e62443e93f771ac2a65c Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@qt.io> Date: Fri, 17 Aug 2018 13:23:58 +0300 Subject: [PATCH] Allow a tools-only build --- - qt3d.pro | 9 +++++++-- + qt3d.pro | 7 ++++++- src/3rdparty/assimp/assimp_dependency.pri | 2 +- - tools/tools.pro | 2 +- + tools/tools.pro | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/qt3d.pro b/qt3d.pro -index 847507f17..286286dd0 100644 +index d5dbda4..6809470 100644 --- a/qt3d.pro +++ b/qt3d.pro -@@ -1,5 +1,5 @@ --requires(qtHaveModule(gui)) --requires(qtConfig(opengl):!wasm) -+!tools-only:requires(qtHaveModule(gui)) -+!tools-only:requires(qtConfig(opengl):!wasm) +@@ -1,4 +1,4 @@ +-qtHaveModule(gui): \ ++!tools-only:qtHaveModule(gui): \ + requires(qtConfig(opengl):!wasm) CONFIG += examples_need_tools - load(qt_parts) @@ -15,3 +15,8 @@ load(qt_parts) OTHER_FILES += \ @@ -31,7 +29,7 @@ index 847507f17..286286dd0 100644 + SUBDIRS = sub_tools +} diff --git a/src/3rdparty/assimp/assimp_dependency.pri b/src/3rdparty/assimp/assimp_dependency.pri -index 8ba2d9a41..e973d93dd 100644 +index 8ba2d9a..e973d93 100644 --- a/src/3rdparty/assimp/assimp_dependency.pri +++ b/src/3rdparty/assimp/assimp_dependency.pri @@ -1,5 +1,5 @@ @@ -42,11 +40,16 @@ index 8ba2d9a41..e973d93dd 100644 } else { include(assimp.pri) diff --git a/tools/tools.pro b/tools/tools.pro -index 121507613..24c49ad5a 100644 +index 3b457ed..9f5376a 100644 --- a/tools/tools.pro +++ b/tools/tools.pro -@@ -1,5 +1,5 @@ +@@ -1,9 +1,9 @@ TEMPLATE = subdirs + +-!qtHaveModule(3dcore): \ ++!tools-only:!qtHaveModule(3dcore): \ + return() + QT_FOR_CONFIG += 3dcore-private -qtConfig(assimp):qtConfig(commandlineparser): { +tools-only|qtConfig(assimp):qtConfig(commandlineparser): { |