diff options
Diffstat (limited to 'recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch')
-rw-r--r-- | recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch | 9 |
1 files changed, 4 insertions, 5 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 3b0a9adb..40a2f5f8 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,9 +1,8 @@ | |||
1 | From 7cb46d20ad89f37828ff9f96363a112eadf11dbd Mon Sep 17 00:00:00 2001 | 1 | From 0ed3e6bbbb83bb7325bddb7d088ef36224af3680 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 | ||
7 | --- | 6 | --- |
8 | qt3d.pro | 7 ++++++- | 7 | qt3d.pro | 7 ++++++- |
9 | src/3rdparty/assimp/assimp_dependency.pri | 2 +- | 8 | src/3rdparty/assimp/assimp_dependency.pri | 2 +- |
@@ -11,7 +10,7 @@ Change-Id: I4de6b96ec51fe297a0eeb757cef56d8fb40bd6f0 | |||
11 | 3 files changed, 8 insertions(+), 3 deletions(-) | 10 | 3 files changed, 8 insertions(+), 3 deletions(-) |
12 | 11 | ||
13 | diff --git a/qt3d.pro b/qt3d.pro | 12 | diff --git a/qt3d.pro b/qt3d.pro |
14 | index 2cc347a1c..81cdeefb0 100644 | 13 | index 2cc347a..81cdeef 100644 |
15 | --- a/qt3d.pro | 14 | --- a/qt3d.pro |
16 | +++ b/qt3d.pro | 15 | +++ b/qt3d.pro |
17 | @@ -1,4 +1,4 @@ | 16 | @@ -1,4 +1,4 @@ |
@@ -30,7 +29,7 @@ index 2cc347a1c..81cdeefb0 100644 | |||
30 | + SUBDIRS = sub_tools | 29 | + SUBDIRS = sub_tools |
31 | +} | 30 | +} |
32 | diff --git a/src/3rdparty/assimp/assimp_dependency.pri b/src/3rdparty/assimp/assimp_dependency.pri | 31 | diff --git a/src/3rdparty/assimp/assimp_dependency.pri b/src/3rdparty/assimp/assimp_dependency.pri |
33 | index 8ba2d9a41..e973d93dd 100644 | 32 | index 8ba2d9a..e973d93 100644 |
34 | --- a/src/3rdparty/assimp/assimp_dependency.pri | 33 | --- a/src/3rdparty/assimp/assimp_dependency.pri |
35 | +++ b/src/3rdparty/assimp/assimp_dependency.pri | 34 | +++ b/src/3rdparty/assimp/assimp_dependency.pri |
36 | @@ -1,5 +1,5 @@ | 35 | @@ -1,5 +1,5 @@ |
@@ -41,7 +40,7 @@ index 8ba2d9a41..e973d93dd 100644 | |||
41 | } else { | 40 | } else { |
42 | include(assimp.pri) | 41 | include(assimp.pri) |
43 | diff --git a/tools/tools.pro b/tools/tools.pro | 42 | diff --git a/tools/tools.pro b/tools/tools.pro |
44 | index 8e973aecb..ad51db585 100644 | 43 | index 8e973ae..ad51db5 100644 |
45 | --- a/tools/tools.pro | 44 | --- a/tools/tools.pro |
46 | +++ b/tools/tools.pro | 45 | +++ b/tools/tools.pro |
47 | @@ -1,4 +1,4 @@ | 46 | @@ -1,4 +1,4 @@ |