summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtjsbackend-5.1.1
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5/qtjsbackend-5.1.1')
-rw-r--r--recipes-qt/qt5/qtjsbackend-5.1.1/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch32
-rw-r--r--recipes-qt/qt5/qtjsbackend-5.1.1/0002-v8.pro-respect-external-host-bindir-when-set.patch31
2 files changed, 0 insertions, 63 deletions
diff --git a/recipes-qt/qt5/qtjsbackend-5.1.1/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch b/recipes-qt/qt5/qtjsbackend-5.1.1/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch
deleted file mode 100644
index 1f94e4ce..00000000
--- a/recipes-qt/qt5/qtjsbackend-5.1.1/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From 973d4f0974c0b9c2504c56a2b9b8d6c709275ee4 Mon Sep 17 00:00:00 2001
2From: Mikko Levonmaa <mikko.levonmaa@palm.com>
3Date: Tue, 4 Dec 2012 11:20:13 -0800
4Subject: [PATCH 1/2] Install the mkv8snapshot tool to the native side
5
6Upstream-Status: Inappropriate [configuration]
7
8Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
9---
10 src/tools/mkv8snapshot/mkv8snapshot.pro | 9 +++++++--
11 1 file changed, 7 insertions(+), 2 deletions(-)
12
13diff --git a/src/tools/mkv8snapshot/mkv8snapshot.pro b/src/tools/mkv8snapshot/mkv8snapshot.pro
14index 16beb02..5e327f7 100644
15--- a/src/tools/mkv8snapshot/mkv8snapshot.pro
16+++ b/src/tools/mkv8snapshot/mkv8snapshot.pro
17@@ -24,5 +24,10 @@ unix:LIBS += -lpthread
18
19 # We don't need to install this tool, it's only used for building v8.
20 # However we do have to make sure that 'make install' builds it.
21-dummytarget.CONFIG = dummy_install
22-INSTALLS += dummytarget
23+#dummytarget.CONFIG = dummy_install
24+#INSTALLS += dummytarget
25+
26+# Install the tool so that during target cross compilation we have access to the native side binary
27+target.path = $$[QT_HOST_BINS]
28+INSTALLS += target
29+
30--
311.8.3.2
32
diff --git a/recipes-qt/qt5/qtjsbackend-5.1.1/0002-v8.pro-respect-external-host-bindir-when-set.patch b/recipes-qt/qt5/qtjsbackend-5.1.1/0002-v8.pro-respect-external-host-bindir-when-set.patch
deleted file mode 100644
index d9bb5b43..00000000
--- a/recipes-qt/qt5/qtjsbackend-5.1.1/0002-v8.pro-respect-external-host-bindir-when-set.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From b0610cdb0c53be6da6d8f94be9af40bf50075368 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sun, 28 Apr 2013 02:45:01 +0200
4Subject: [PATCH 2/2] v8.pro: respect external-host-bindir, when set
5
6Upstream-Status: Pending
7
8Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
9---
10 src/v8/v8.pro | 5 ++++-
11 1 file changed, 4 insertions(+), 1 deletion(-)
12
13diff --git a/src/v8/v8.pro b/src/v8/v8.pro
14index 2be6a19..d3da4e1 100644
15--- a/src/v8/v8.pro
16+++ b/src/v8/v8.pro
17@@ -25,7 +25,10 @@ INCLUDEPATH -= $$MODULE_INCLUDES $$MODULE_INCLUDES/..
18 include(v8.pri)
19
20 contains(QT_CONFIG, v8snapshot) {
21- mkv8snapshot.commands = ../../bin/mkv8snapshot$$qtPlatformTargetSuffix() ${QMAKE_FILE_OUT}
22+ mkv8snapshot.tool=$$[QT_EXTERNAL_HOST_BINS]/mkv8snapshot$$qtPlatformTargetSuffix()
23+ !exists($$mkv8snapshot.tool): \
24+ mkv8snapshot.tool=../../bin/mkv8snapshot$$qtPlatformTargetSuffix()
25+ mkv8snapshot.commands = $$mkv8snapshot.tool ${QMAKE_FILE_OUT}
26 DUMMY_FILE = v8.pro
27 mkv8snapshot.input = DUMMY_FILE
28 mkv8snapshot.output = $$V8_GENERATED_SOURCES_DIR/snapshot.cpp
29--
301.8.3.2
31