diff options
Diffstat (limited to 'meta/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch')
-rw-r--r-- | meta/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch b/meta/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch new file mode 100644 index 0000000000..66c8017329 --- /dev/null +++ b/meta/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch @@ -0,0 +1,51 @@ +From 05562960b7a3ed7753c9a39a7032fea873fc4098 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 ++++++- + src/3rdparty/assimp/assimp_dependency.pri | 2 +- + tools/tools.pro | 2 +- + 3 files changed, 8 insertions(+), 3 deletions(-) + +diff --git a/qt3d.pro b/qt3d.pro +index 2cc347a..81cdeef 100644 +--- a/qt3d.pro ++++ b/qt3d.pro +@@ -1,4 +1,4 @@ +-requires(qtConfig(opengl)) ++!tools-only:requires(qtConfig(opengl)) + + CONFIG += examples_need_tools + load(qt_parts) +@@ -14,3 +14,8 @@ load(qt_parts) + + OTHER_FILES += \ + sync.profile ++ ++tools-only { ++ 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) +diff --git a/tools/tools.pro b/tools/tools.pro +index 8e973ae..ad51db5 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): \ + SUBDIRS += qgltf |