diff options
-rw-r--r-- | recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch | 16 | ||||
-rw-r--r-- | recipes-qt/qt5/qt3d_git.bb | 2 |
2 files changed, 15 insertions, 3 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 b19f963e..248fb473 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,12 +1,14 @@ | |||
1 | From 64f46f5399627430f9ce1a888fb9212b33977231 Mon Sep 17 00:00:00 2001 | 1 | From b3fbc6be8844cf2eb8a47d39b1b7ce8016ce5d52 Mon Sep 17 00:00:00 2001 |
2 | From: Samuli Piippo <samuli.piippo@theqtcompany.com> | 2 | From: Samuli Piippo <samuli.piippo@theqtcompany.com> |
3 | Date: Wed, 10 Feb 2016 09:02:09 +0200 | 3 | Date: Wed, 10 Feb 2016 09:02:09 +0200 |
4 | Subject: [PATCH] Allow a tools-only build | 4 | Subject: [PATCH] Allow a tools-only build |
5 | 5 | ||
6 | Change-Id: I4de6b96ec51fe297a0eeb757cef56d8fb40bd6f0 | ||
6 | --- | 7 | --- |
7 | qt3d.pro | 7 ++++++- | 8 | qt3d.pro | 7 ++++++- |
8 | src/3rdparty/assimp/assimp_dependency.pri | 2 +- | 9 | src/3rdparty/assimp/assimp_dependency.pri | 2 +- |
9 | 2 files changed, 7 insertions(+), 2 deletions(-) | 10 | tools/tools.pro | 2 +- |
11 | 3 files changed, 8 insertions(+), 3 deletions(-) | ||
10 | 12 | ||
11 | diff --git a/qt3d.pro b/qt3d.pro | 13 | diff --git a/qt3d.pro b/qt3d.pro |
12 | index 2cc347a..81cdeef 100644 | 14 | index 2cc347a..81cdeef 100644 |
@@ -38,3 +40,13 @@ index 8ba2d9a..e973d93 100644 | |||
38 | QMAKE_USE_PRIVATE += assimp | 40 | QMAKE_USE_PRIVATE += assimp |
39 | } else { | 41 | } else { |
40 | include(assimp.pri) | 42 | include(assimp.pri) |
43 | diff --git a/tools/tools.pro b/tools/tools.pro | ||
44 | index 8e973ae..ad51db5 100644 | ||
45 | --- a/tools/tools.pro | ||
46 | +++ b/tools/tools.pro | ||
47 | @@ -1,4 +1,4 @@ | ||
48 | TEMPLATE = subdirs | ||
49 | QT_FOR_CONFIG += 3dcore-private | ||
50 | -!android:qtConfig(assimp):qtConfig(commandlineparser): \ | ||
51 | +!android:tools-only|qtConfig(assimp):qtConfig(commandlineparser): \ | ||
52 | SUBDIRS += qgltf | ||
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index 3bcbf66a..43e86ef9 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb | |||
@@ -34,6 +34,6 @@ do_configure_prepend() { | |||
34 | ${S}/src/quick3d/imports/input/importsinput.pro | 34 | ${S}/src/quick3d/imports/input/importsinput.pro |
35 | } | 35 | } |
36 | 36 | ||
37 | SRCREV = "a2b7483fa18e109011246fba5e7963338a77af56" | 37 | SRCREV = "bb0f4b48390b5ddc9758f04f6ecd692072fb279f" |
38 | 38 | ||
39 | BBCLASSEXTEND += "native nativesdk" | 39 | BBCLASSEXTEND += "native nativesdk" |