diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-02-08 17:00:25 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-02-28 12:27:25 +0000 |
commit | 6be627fd5f2d1c0ef29d052164f23bc94f914b31 (patch) | |
tree | 7215368734f32fff9f0f79fe90e332e2e394a000 /meta/recipes-qt/qt4/qt-4.8.0 | |
parent | 76c17122024e49fdc84e237b9d5dde6525778d6b (diff) | |
download | poky-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/qt-4.8.0')
-rw-r--r-- | meta/recipes-qt/qt4/qt-4.8.0/qmake_pri_fixes.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt-4.8.0/qmake_pri_fixes.patch b/meta/recipes-qt/qt4/qt-4.8.0/qmake_pri_fixes.patch new file mode 100644 index 0000000000..82bff04974 --- /dev/null +++ b/meta/recipes-qt/qt4/qt-4.8.0/qmake_pri_fixes.patch | |||
@@ -0,0 +1,51 @@ | |||
1 | From c56ed5f64a5f47cf8d539aa4ca9bedbe1fea2264 Mon Sep 17 00:00:00 2001 | ||
2 | From: Paul Eggleton <paul.eggleton@linux.intel.com> | ||
3 | Date: Fri, 10 Feb 2012 15:32:12 +0000 | ||
4 | Subject: [PATCH] qmake: fix source file references in qmake.pri | ||
5 | |||
6 | Fix duplicate entries in SOURCES and HEADERS, and fix the source file | ||
7 | list for the split of qlocale.cpp. | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | |||
11 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> | ||
12 | --- | ||
13 | qmake/qmake.pri | 8 ++++---- | ||
14 | 1 files changed, 4 insertions(+), 4 deletions(-) | ||
15 | |||
16 | diff --git a/qmake/qmake.pri b/qmake/qmake.pri | ||
17 | index f2a3705..2d4e94c 100644 | ||
18 | --- a/qmake/qmake.pri | ||
19 | +++ b/qmake/qmake.pri | ||
20 | @@ -22,8 +22,7 @@ SOURCES += project.cpp property.cpp main.cpp generators/makefile.cpp \ | ||
21 | generators/symbian/initprojectdeploy_symbian.cpp \ | ||
22 | generators/integrity/gbuild.cpp \ | ||
23 | windows/registry.cpp \ | ||
24 | - symbian/epocroot.cpp \ | ||
25 | - generators/integrity/gbuild.cpp | ||
26 | + symbian/epocroot.cpp | ||
27 | |||
28 | HEADERS += project.h property.h generators/makefile.h \ | ||
29 | generators/unix/unixmake.h meta.h option.h cachekeys.h \ | ||
30 | @@ -40,8 +39,7 @@ HEADERS += project.h property.h generators/makefile.h \ | ||
31 | generators/symbian/initprojectdeploy_symbian.h \ | ||
32 | generators/integrity/gbuild.h \ | ||
33 | windows/registry_p.h \ | ||
34 | - symbian/epocroot_p.h \ | ||
35 | - generators/integrity/gbuild.h | ||
36 | + symbian/epocroot_p.h | ||
37 | |||
38 | contains(QT_EDITION, OpenSource) { | ||
39 | DEFINES += QMAKE_OPENSOURCE_EDITION | ||
40 | @@ -72,6 +70,8 @@ bootstrap { #Qt code | ||
41 | qlist.cpp \ | ||
42 | qlinkedlist.cpp \ | ||
43 | qlocale.cpp \ | ||
44 | + qlocale_tools.cpp \ | ||
45 | + qlocale_unix.cpp \ | ||
46 | qmalloc.cpp \ | ||
47 | qmap.cpp \ | ||
48 | qmetatype.cpp \ | ||
49 | -- | ||
50 | 1.7.5.4 | ||
51 | |||