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 @@
-From befe1fd63c485b8d10d1b9f1eca3368f3ee0042b Mon Sep 17 00:00:00 2001
+From 64f46f5399627430f9ce1a888fb9212b33977231 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
 
 ---
- qt3d.pro | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
+ qt3d.pro                                  | 7 ++++++-
+ src/3rdparty/assimp/assimp_dependency.pri | 2 +-
+ 2 files changed, 7 insertions(+), 2 deletions(-)
 
 diff --git a/qt3d.pro b/qt3d.pro
-index a26e76d..016fb30 100644
+index 2cc347a..81cdeef 100644
 --- a/qt3d.pro
 +++ b/qt3d.pro
 @@ -1,4 +1,4 @@
--requires(contains(QT_CONFIG, opengl))
-+!tools-only:requires(contains(QT_CONFIG, opengl))
+-requires(qtConfig(opengl))
++!tools-only:requires(qtConfig(opengl))
  
- load(configure)
- qtCompileTest(assimp)
-@@ -17,3 +17,8 @@ load(qt_parts)
+ CONFIG += examples_need_tools
+ load(qt_parts)
+@@ -14,3 +14,8 @@ load(qt_parts)
  
  OTHER_FILES += \
      sync.profile
@@ -26,3 +27,14 @@ index a26e76d..016fb30 100644
 +    sub_tools.depends -= sub_src
 +    SUBDIRS = sub_tools
 +}
+diff --git a/src/3rdparty/assimp/assimp_dependency.pri b/src/3rdparty/assimp/assimp_dependency.pri
+index 8ba2d9a..e973d93 100644
+--- a/src/3rdparty/assimp/assimp_dependency.pri
++++ b/src/3rdparty/assimp/assimp_dependency.pri
+@@ -1,5 +1,5 @@
+ QT_FOR_CONFIG += 3dcore-private
+-qtConfig(system-assimp):!if(cross_compile:host_build) {
++!tools-only:qtConfig(system-assimp):!if(cross_compile:host_build) {
+     QMAKE_USE_PRIVATE += assimp
+ } else {
+     include(assimp.pri)