summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4/files/target_qmake.patch
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-02-08 17:00:25 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-28 12:27:25 +0000
commit6be627fd5f2d1c0ef29d052164f23bc94f914b31 (patch)
tree7215368734f32fff9f0f79fe90e332e2e394a000 /meta/recipes-qt/qt4/files/target_qmake.patch
parent76c17122024e49fdc84e237b9d5dde6525778d6b (diff)
downloadpoky-6be627fd5f2d1c0ef29d052164f23bc94f914b31.tar.gz
qt4: build qmake for the target
qmake was not being built at all (since we had the host version from qt4-native) and the default is to build for the host machine within configure. With a minor hack we can build qmake for the target as well, which is useful if you want to build Qt 4 software on an actual device. This is now installed as part of the tools package (together with uic, moc etc.) Additionally, add an environment setup script (installed in /usr/share/qt4/environment-setup or /usr/share/qtopia/environment-setup for the embedded version) as part of the mkspecs package since the mkspecs will not work without the paths set up by this script. The code to create this script was adapted from the qmake2 recipe in meta-oe. Also move do_compile() from qt-${PV}.inc up to qt4.inc as both versions have the exact same content. (From OE-Core rev: 4306606489a2d922595d4c86a21c496bbd8a607e) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/files/target_qmake.patch')
-rw-r--r--meta/recipes-qt/qt4/files/target_qmake.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/files/target_qmake.patch b/meta/recipes-qt/qt4/files/target_qmake.patch
new file mode 100644
index 0000000000..9b53aff172
--- /dev/null
+++ b/meta/recipes-qt/qt4/files/target_qmake.patch
@@ -0,0 +1,27 @@
1From e4b27237386b3dd864dd603de2ae54a707f5419f Mon Sep 17 00:00:00 2001
2From: Paul Eggleton <paul.eggleton@linux.intel.com>
3Date: Mon, 27 Feb 2012 00:13:05 +0000
4Subject: [PATCH] Allow building a separate qmake for the target
5
6Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
7
8Upstream-Status: Inappropriate [config]
9---
10 qmake/qmake.pro | 1 +
11 1 files changed, 1 insertions(+), 0 deletions(-)
12
13diff --git a/qmake/qmake.pro b/qmake/qmake.pro
14index b602afa..b59f7fb 100644
15--- a/qmake/qmake.pro
16+++ b/qmake/qmake.pro
17@@ -7,6 +7,7 @@ CONFIG += console bootstrap
18 CONFIG -= qt shared app_bundle uic
19 DEFINES += QT_BUILD_QMAKE QT_BOOTSTRAPPED
20 DESTDIR = ../bin/
21+TARGET = qmake2
22
23 OBJECTS_DIR = .
24 MOC_DIR = .
25--
261.7.5.4
27