summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@theqtcompany.com>2015-10-30 14:18:44 +0100
committerLaszlo Agocs <laszlo.agocs@theqtcompany.com>2015-11-03 07:56:56 +0000
commit9f7794266b93dd7c8aa3b96f084a38053a0a3445 (patch)
tree546dc3fe7e594f7036bfd4a5e59d0c1981937ac7
parenta2f8538312a7a213950685d9560105c7503df6cc (diff)
downloadmeta-boot2qt-9f7794266b93dd7c8aa3b96f084a38053a0a3445.tar.gz
Remove qdoc patch not needed for anymore in dev/5.6
Change-Id: I5013bb78d9e0140b52b29d9789f97b0f0037eb48 Reviewed-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
-rw-r--r--recipes-qt/qt5/qtbase/0001-qdoc-workaround-for-gcc-s-ICE.patch29
-rw-r--r--recipes-qt/qt5/qtbase_%.bbappend2
2 files changed, 0 insertions, 31 deletions
diff --git a/recipes-qt/qt5/qtbase/0001-qdoc-workaround-for-gcc-s-ICE.patch b/recipes-qt/qt5/qtbase/0001-qdoc-workaround-for-gcc-s-ICE.patch
deleted file mode 100644
index 85e569f..0000000
--- a/recipes-qt/qt5/qtbase/0001-qdoc-workaround-for-gcc-s-ICE.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From 75840ad8b40068b70792a27f1fdc7cccf3d28f7c Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@theqtcompany.com>
3Date: Wed, 16 Sep 2015 13:30:38 +0300
4Subject: [PATCH] qdoc: workaround for gcc's ICE
5
6Remove c++11 option from compilation to prevent gcc's internal compiler error:
7in add_stores, at var-tracking.c:6000
8
9Signed-off-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
10---
11 src/tools/qdoc/qdoc.pro | 2 ++
12 1 file changed, 2 insertions(+)
13
14diff --git a/src/tools/qdoc/qdoc.pro b/src/tools/qdoc/qdoc.pro
15index f0df113..a847482 100644
16--- a/src/tools/qdoc/qdoc.pro
17+++ b/src/tools/qdoc/qdoc.pro
18@@ -4,6 +4,8 @@
19 requires(!contains(QT_DISABLED_FEATURES, dom))
20 }
21
22+QMAKE_CXXFLAGS_CXX11 =
23+
24 option(host_build)
25 QT = core xml
26
27--
281.9.1
29
diff --git a/recipes-qt/qt5/qtbase_%.bbappend b/recipes-qt/qt5/qtbase_%.bbappend
index 6ce74b2..bea5e18 100644
--- a/recipes-qt/qt5/qtbase_%.bbappend
+++ b/recipes-qt/qt5/qtbase_%.bbappend
@@ -39,9 +39,7 @@ FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
39 39
40SRC_URI += " \ 40SRC_URI += " \
41 file://oe-device-extra.pri \ 41 file://oe-device-extra.pri \
42 file://0001-qdoc-workaround-for-gcc-s-ICE.patch \
43 " 42 "
44
45do_configure_prepend() { 43do_configure_prepend() {
46 install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs 44 install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs
47 sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf 45 sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf