summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4/qt4-embedded.inc
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2014-12-29 10:25:55 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-16 23:08:20 +0000
commit5b7371b832f594aaeb3564fd4a64d8583e337b67 (patch)
tree8365778b685a0e1e8d2ba3c25f8323bb11722285 /meta/recipes-qt/qt4/qt4-embedded.inc
parentac35e3cabd3217ba0cb38a003a747e7bfa78fd72 (diff)
downloadpoky-5b7371b832f594aaeb3564fd4a64d8583e337b67.tar.gz
qt4-embedded: support c++0x stand for directfb
While directfd upgrade to 1.7.6, it always includes directfb++ utils when C++ is used and set c++0x as c++ standard. (In git://git.directfb.org/git/directfb/core/DirectFB.git commit b444bcae3197be9faf883460dcc239ef757d5922, and commit 522beeb76f2a8d2dee30d928d2a5955bd06cf25c) The directfd in qt4-embedded is c++, and there was a build failure: ... | qdirectfbwindowsurface.cpp:336:69: error: in C++98 'rect' must be initialized by constructor, not by '{...}' | const DFBRectangle rect = { r.x(), r.y(), r.width(), r.height() }; ... The g++ used c++98 as default c++ standard, we should explicitly set c++0x for directfd in qt4-embedded. (From OE-Core rev: 833cb0e47f7542a67bdf943cede1754b7a20c1d9) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-embedded.inc')
-rw-r--r--meta/recipes-qt/qt4/qt4-embedded.inc4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc
index e87de4b379..ef5cf2cf24 100644
--- a/meta/recipes-qt/qt4/qt4-embedded.inc
+++ b/meta/recipes-qt/qt4/qt4-embedded.inc
@@ -9,7 +9,9 @@ QT4EDEPENDS = ""
9QT_BASE_LIB ?= "libqt-embedded" 9QT_BASE_LIB ?= "libqt-embedded"
10 10
11# Set necessary variables in the profile 11# Set necessary variables in the profile
12SRC_URI += "file://qte.sh" 12SRC_URI += "file://qte.sh \
13 file://0033-configure-support-c-0x-standard-for-directfd.patch \
14"
13 15
14QT_EMBEDDED_FLAGS ?= " \ 16QT_EMBEDDED_FLAGS ?= " \
15 -embedded $QT_ARCH \ 17 -embedded $QT_ARCH \