summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-qt')
-rw-r--r--meta/recipes-qt/qt4/files/add_nostrip_for_debug_packages.diff23
-rw-r--r--meta/recipes-qt/qt4/qt-4.7.4.inc1
-rw-r--r--meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb2
-rw-r--r--meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb2
4 files changed, 26 insertions, 2 deletions
diff --git a/meta/recipes-qt/qt4/files/add_nostrip_for_debug_packages.diff b/meta/recipes-qt/qt4/files/add_nostrip_for_debug_packages.diff
new file mode 100644
index 0000000000..774cb997a4
--- /dev/null
+++ b/meta/recipes-qt/qt4/files/add_nostrip_for_debug_packages.diff
@@ -0,0 +1,23 @@
1author: Fathi Boudra <fabo@debian.org>
2
3Qt is built in release mode and strip files by default.
4Set CONFIG+=nostrip to avoid the stripping and
5let dh_strip do it to generate debug packages.
6
7Upstream-Status: Inappropriate [Configuration]
8
9---
10 configure | 2 ++
11 1 file changed, 2 insertions(+)
12
13--- a/configure
14+++ b/configure
15@@ -627,6 +627,8 @@ mkdir -p "$outpath/config.tests"
16 rm -f "$outpath/config.tests/.qmake.cache"
17 cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache"
18
19+QMakeVar add CONFIG nostrip
20+
21 QMakeVar add styles "cde mac motif plastique cleanlooks windows"
22 QMakeVar add decorations "default windows styled"
23 QMakeVar add mouse-drivers "pc"
diff --git a/meta/recipes-qt/qt4/qt-4.7.4.inc b/meta/recipes-qt/qt4/qt-4.7.4.inc
index bc33b6b1b8..7a3ba54cc8 100644
--- a/meta/recipes-qt/qt4/qt-4.7.4.inc
+++ b/meta/recipes-qt/qt4/qt-4.7.4.inc
@@ -14,6 +14,7 @@ SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.
14 file://0001-Added-Openembedded-crossarch-option.patch \ 14 file://0001-Added-Openembedded-crossarch-option.patch \
15 file://blacklist-diginotar-certs.diff \ 15 file://blacklist-diginotar-certs.diff \
16 file://fix-translations.patch \ 16 file://fix-translations.patch \
17 file://add_nostrip_for_debug_packages.diff \
17 file://g++.conf \ 18 file://g++.conf \
18 file://linux.conf \ 19 file://linux.conf \
19 file://fix-qtbug-20925.patch \ 20 file://fix-qtbug-20925.patch \
diff --git a/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb b/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb
index e34ec8d5db..6b9f97a356 100644
--- a/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb
+++ b/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb
@@ -1,7 +1,7 @@
1require qt-${PV}.inc 1require qt-${PV}.inc
2require qt4-embedded.inc 2require qt4-embedded.inc
3 3
4PR = "${INC_PR}.3" 4PR = "${INC_PR}.4"
5 5
6QT_CONFIG_FLAGS_append_armv6-vfp = " -no-neon " 6QT_CONFIG_FLAGS_append_armv6-vfp = " -no-neon "
7 7
diff --git a/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb b/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb
index 8c489362d7..0db090f8e0 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb
+++ b/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb
@@ -1,7 +1,7 @@
1require qt4-x11-free.inc 1require qt4-x11-free.inc
2require qt-${PV}.inc 2require qt-${PV}.inc
3 3
4PR = "${INC_PR}.3" 4PR = "${INC_PR}.4"
5 5
6QT_CONFIG_FLAGS_append_armv6-vfp = " -no-neon " 6QT_CONFIG_FLAGS_append_armv6-vfp = " -no-neon "
7 7