summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qt3d
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2017-01-26 16:54:50 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2017-01-26 16:18:39 +0100
commit333949a8239dfa7788b35f1059614733e11a6a25 (patch)
tree420843abad8bfc939484fa34bd6f7da9d432db8d /recipes-qt/qt5/qt3d
parentc0ba8ab590ba4e17a2a04925cf48915233d4f493 (diff)
downloadmeta-qt5-333949a8239dfa7788b35f1059614733e11a6a25.tar.gz
Upgrade to Qt 5.8
The linux-oe-g++ mkspec is changed to use $$(...) operator to obtain the contents of an environment value when qmake is run instead of when Makefile is processed. All OE_QMAKE_xxx variables need to be exported for qmake to find them. configure's setBootstrapVariable function needs to change $$(..) to normal $(...) operator to work with qmake's Makefile. qt.conf generation for qtbase recipes is not needed, as configure will generate its own version based on configure arguments. Skip running qmake, since configure is now automatically invoked when it's run in qtbase's root folder. Update PACKAGECONFIGs for qtbase to match current configure options. The new Qt configuration system [1] can be used with a new variable EXTRA_QMAKEVARS_CONFIGURE, which takes both command line and feature arguments. Merge the two qtwayland recipes to one that supports all three targets (target, native, nativesdk) without need for additional patch. Recipes for new Qt modules: QtSCXML, QtNetworkAuth, QtGamepad. Removes qtdeclarative-render2d [1] https://www.mail-archive.com/development@qt-project.org/msg25257.html Change-Id: Ib37c4d7323e8b45aa2b171e8427b6ec15aaee213 Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> 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.patch30
1 files changed, 21 insertions, 9 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 bb337fde..b19f963e 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,23 +1,24 @@
1From befe1fd63c485b8d10d1b9f1eca3368f3ee0042b Mon Sep 17 00:00:00 2001 1From 64f46f5399627430f9ce1a888fb9212b33977231 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@theqtcompany.com> 2From: Samuli Piippo <samuli.piippo@theqtcompany.com>
3Date: Wed, 10 Feb 2016 09:02:09 +0200 3Date: Wed, 10 Feb 2016 09:02:09 +0200
4Subject: [PATCH] Allow a tools-only build 4Subject: [PATCH] Allow a tools-only build
5 5
6--- 6---
7 qt3d.pro | 7 ++++++- 7 qt3d.pro | 7 ++++++-
8 1 file changed, 6 insertions(+), 1 deletion(-) 8 src/3rdparty/assimp/assimp_dependency.pri | 2 +-
9 2 files changed, 7 insertions(+), 2 deletions(-)
9 10
10diff --git a/qt3d.pro b/qt3d.pro 11diff --git a/qt3d.pro b/qt3d.pro
11index a26e76d..016fb30 100644 12index 2cc347a..81cdeef 100644
12--- a/qt3d.pro 13--- a/qt3d.pro
13+++ b/qt3d.pro 14+++ b/qt3d.pro
14@@ -1,4 +1,4 @@ 15@@ -1,4 +1,4 @@
15-requires(contains(QT_CONFIG, opengl)) 16-requires(qtConfig(opengl))
16+!tools-only:requires(contains(QT_CONFIG, opengl)) 17+!tools-only:requires(qtConfig(opengl))
17 18
18 load(configure) 19 CONFIG += examples_need_tools
19 qtCompileTest(assimp) 20 load(qt_parts)
20@@ -17,3 +17,8 @@ load(qt_parts) 21@@ -14,3 +14,8 @@ load(qt_parts)
21 22
22 OTHER_FILES += \ 23 OTHER_FILES += \
23 sync.profile 24 sync.profile
@@ -26,3 +27,14 @@ index a26e76d..016fb30 100644
26+ sub_tools.depends -= sub_src 27+ sub_tools.depends -= sub_src
27+ SUBDIRS = sub_tools 28+ SUBDIRS = sub_tools
28+} 29+}
30diff --git a/src/3rdparty/assimp/assimp_dependency.pri b/src/3rdparty/assimp/assimp_dependency.pri
31index 8ba2d9a..e973d93 100644
32--- a/src/3rdparty/assimp/assimp_dependency.pri
33+++ b/src/3rdparty/assimp/assimp_dependency.pri
34@@ -1,5 +1,5 @@
35 QT_FOR_CONFIG += 3dcore-private
36-qtConfig(system-assimp):!if(cross_compile:host_build) {
37+!tools-only:qtConfig(system-assimp):!if(cross_compile:host_build) {
38 QMAKE_USE_PRIVATE += assimp
39 } else {
40 include(assimp.pri)