diff options
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/0004-Generate-usable-qmake_extras.gypi.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/0004-Generate-usable-qmake_extras.gypi.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0004-Generate-usable-qmake_extras.gypi.patch b/recipes-qt/qt5/qtwebengine/0004-Generate-usable-qmake_extras.gypi.patch index 89f56e05..55dc557a 100644 --- a/recipes-qt/qt5/qtwebengine/0004-Generate-usable-qmake_extras.gypi.patch +++ b/recipes-qt/qt5/qtwebengine/0004-Generate-usable-qmake_extras.gypi.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 9d2fafdd9a15adf51d8383bdd545d73e76ad0428 Mon Sep 17 00:00:00 2001 | 1 | From 55c5a15f0a11c76a930020ac725e57303da2ef48 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: Mon, 11 May 2015 13:47:06 +0300 | 3 | Date: Mon, 11 May 2015 13:47:06 +0300 |
4 | Subject: [PATCH] Generate usable qmake_extras.gypi | 4 | Subject: [PATCH 4/4] Generate usable qmake_extras.gypi |
5 | 5 | ||
6 | Running qmake recursively does not take .depends into account, so | 6 | Running qmake recursively does not take .depends into account, so |
7 | the SUBDIRS need to be in correct order so that qmake_extras.gypi | 7 | the SUBDIRS need to be in correct order so that qmake_extras.gypi |
@@ -39,7 +39,7 @@ index cf00f39..747b711 100644 | |||
39 | +SUBDIRS += gyp_run \ | 39 | +SUBDIRS += gyp_run \ |
40 | + core_module | 40 | + core_module |
41 | diff --git a/src/core/gyp_configure_host.pro b/src/core/gyp_configure_host.pro | 41 | diff --git a/src/core/gyp_configure_host.pro b/src/core/gyp_configure_host.pro |
42 | index 3eb6738..d6820c4 100644 | 42 | index eb94cb8..859bcbf 100644 |
43 | --- a/src/core/gyp_configure_host.pro | 43 | --- a/src/core/gyp_configure_host.pro |
44 | +++ b/src/core/gyp_configure_host.pro | 44 | +++ b/src/core/gyp_configure_host.pro |
45 | @@ -6,9 +6,6 @@ option(host_build) | 45 | @@ -6,9 +6,6 @@ option(host_build) |
@@ -50,10 +50,10 @@ index 3eb6738..d6820c4 100644 | |||
50 | - " ['CXX.host', '$$which($$QMAKE_CXX)']," \ | 50 | - " ['CXX.host', '$$which($$QMAKE_CXX)']," \ |
51 | - " ['LD.host', '$$which($$QMAKE_LINK)']," | 51 | - " ['LD.host', '$$which($$QMAKE_LINK)']," |
52 | 52 | ||
53 | GYPI_FILE = $$absolute_path('qmake_extras.gypi') | 53 | GYPI_FILE = $$OUT_PWD/qmake_extras.gypi |
54 | !build_pass { | 54 | !build_pass { |
55 | diff --git a/src/core/gyp_configure_target.pro b/src/core/gyp_configure_target.pro | 55 | diff --git a/src/core/gyp_configure_target.pro b/src/core/gyp_configure_target.pro |
56 | index 4d52044..f02bfa0 100644 | 56 | index 2a59966..317d24a 100644 |
57 | --- a/src/core/gyp_configure_target.pro | 57 | --- a/src/core/gyp_configure_target.pro |
58 | +++ b/src/core/gyp_configure_target.pro | 58 | +++ b/src/core/gyp_configure_target.pro |
59 | @@ -3,9 +3,6 @@ TEMPLATE = aux | 59 | @@ -3,9 +3,6 @@ TEMPLATE = aux |
@@ -67,5 +67,5 @@ index 4d52044..f02bfa0 100644 | |||
67 | " 'target_defaults': {" \ | 67 | " 'target_defaults': {" \ |
68 | " 'target_conditions': [" \ | 68 | " 'target_conditions': [" \ |
69 | -- | 69 | -- |
70 | 1.9.1 | 70 | 2.5.3 |
71 | 71 | ||