diff options
| author |   Hongxu Jia <hongxu.jia@windriver.com> | 2014-12-29 10:25:55 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-01-16 22:59:45 +0000 |
| commit | 833cb0e47f7542a67bdf943cede1754b7a20c1d9 (patch) | |
| tree | 8cf602766dcbf9c1922fb461b6b1cca4282e3957 /meta/recipes-qt | |
| parent | 15c0ee00550b9e5aac04da598393a614a45bc8a9 (diff) | |
| download | openembedded-core-contrib-833cb0e47f7542a67bdf943cede1754b7a20c1d9.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.
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Diffstat (limited to 'meta/recipes-qt')
| -rw-r--r-- | meta/recipes-qt/qt4/qt4-4.8.6/0033-configure-support-c-0x-standard-for-directfd.patch | 40 | ||||
| -rw-r--r-- | meta/recipes-qt/qt4/qt4-embedded.inc | 4 |
2 files changed, 43 insertions, 1 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/0033-configure-support-c-0x-standard-for-directfd.patch b/meta/recipes-qt/qt4/qt4-4.8.6/0033-configure-support-c-0x-standard-for-directfd.patch new file mode 100644 index 0000000000..f3face5755 --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-4.8.6/0033-configure-support-c-0x-standard-for-directfd.patch @@ -0,0 +1,40 @@ +configure: support c++0x standard for directfd + +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 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. + +Upstream-Status: Pending + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + configure | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure b/configure +index 5724bd6..ecc2f8b 100755 +--- a/configure ++++ b/configure +@@ -6656,6 +6656,7 @@ if [ "$PLATFORM_QWS" = "yes" ]; then + if [ "${screen}" = "directfb" ] && [ "${CFG_CONFIGURE_EXIT_ON_ERROR}" = "yes" ]; then + if test -n "$PKG_CONFIG" && "$PKG_CONFIG" --exists directfb 2>/dev/null; then + QT_CFLAGS_DIRECTFB=`$PKG_CONFIG --cflags directfb 2>/dev/null` ++ QT_CFLAGS_DIRECTFB="$QT_CFLAGS_DIRECTFB -std=c++0x" + QT_LIBS_DIRECTFB=`$PKG_CONFIG --libs directfb 2>/dev/null` + elif directfb-config --version >/dev/null 2>&1; then + QT_CFLAGS_DIRECTFB=`directfb-config --cflags 2>/dev/null` +-- +1.9.1 + 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 = "" QT_BASE_LIB ?= "libqt-embedded" # Set necessary variables in the profile -SRC_URI += "file://qte.sh" +SRC_URI += "file://qte.sh \ + file://0033-configure-support-c-0x-standard-for-directfd.patch \ +" QT_EMBEDDED_FLAGS ?= " \ -embedded $QT_ARCH \ |