diff options
| author | Fatih Aşıcı <fatih.asici@gmail.com> | 2015-01-22 14:37:57 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2015-02-02 21:47:39 +0100 |
| commit | 9fff65cf1a1278702b5c9a5fb63e0cec583ab593 (patch) | |
| tree | a3ac993acea88bb39da85e8bf861e44c2a24ce4e /package/qt5/qt5base/0001-Simplify-use-of-__has_include-in-qlogging.cpp.patch | |
| parent | 59a962af7a8ef15b97724c421b8658a030e308ac (diff) | |
| download | buildroot-9fff65cf1a1278702b5c9a5fb63e0cec583ab593.tar.gz buildroot-9fff65cf1a1278702b5c9a5fb63e0cec583ab593.zip | |
qt5: bump to version 5.4.0
qt5base:
- Add patches to fix uClibc build.
qt5connectivity:
- Add patches to fix build with -no-c++11
qt5declarative:
- Remove the line that installs accessible plugin. The functionality
is moved into the qtquick library.
qt5webkit:
- Remove egl patch. This should be fixed with CONFIG += egl option.
qt5websockets:
- Remove upstreamed patch.
Changelogs: https://qt-project.org/wiki/Change-files-in-Qt-5.4.0
Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/qt5/qt5base/0001-Simplify-use-of-__has_include-in-qlogging.cpp.patch')
| -rw-r--r-- | package/qt5/qt5base/0001-Simplify-use-of-__has_include-in-qlogging.cpp.patch | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/package/qt5/qt5base/0001-Simplify-use-of-__has_include-in-qlogging.cpp.patch b/package/qt5/qt5base/0001-Simplify-use-of-__has_include-in-qlogging.cpp.patch new file mode 100644 index 0000000000..d54ef79404 --- /dev/null +++ b/package/qt5/qt5base/0001-Simplify-use-of-__has_include-in-qlogging.cpp.patch @@ -0,0 +1,54 @@ +0002-logging-Fix-build-with-uClibc.patch depends on this upstream patch. + +Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com> + +From d1d3c36e876464a9bae42565f086ded268ab5118 Mon Sep 17 00:00:00 2001 +From: Thiago Macieira <thiago.macieira@intel.com> +Date: Wed, 17 Dec 2014 20:24:04 -0800 +Subject: [PATCH] Simplify use of __has_include in qlogging.cpp + +Easier to just #define it to 0 + +Change-Id: Ife99fdca6564077762fa67c6d7a5becaf48655d8 +Reviewed-by: Olivier Goffart <ogoffart@woboq.com> +--- + src/corelib/global/qlogging.cpp | 21 +++++++++------------ + 1 file changed, 9 insertions(+), 12 deletions(-) + +diff --git a/src/corelib/global/qlogging.cpp b/src/corelib/global/qlogging.cpp +index 0271573..50d35a6 100644 +--- a/src/corelib/global/qlogging.cpp ++++ b/src/corelib/global/qlogging.cpp +@@ -72,20 +72,17 @@ + # include "private/qcore_unix_p.h" + #endif + +-#if !defined QT_NO_REGULAREXPRESSION && !defined(QT_BOOTSTRAPPED) +-#ifdef __has_include +-#if __has_include(<cxxabi.h>) && __has_include(<execinfo.h>) +-#define QLOGGING_HAVE_BACKTRACE +-#endif +-#elif defined(__GLIBCXX__) && defined(__GLIBC__) // (because older version of gcc don't have __has_include) +-#define QLOGGING_HAVE_BACKTRACE ++#ifndef __has_include ++# define __has_include(x) 0 + #endif + +-#ifdef QLOGGING_HAVE_BACKTRACE +-#include <qregularexpression.h> +-#include <cxxabi.h> +-#include <execinfo.h> +-#endif ++#if !defined QT_NO_REGULAREXPRESSION && !defined(QT_BOOTSTRAPPED) ++# if (defined(__GLIBC__) && defined(__GLIBCXX__)) || (__has_include(<cxxabi.h>) && __has_include(<execinfo.h>)) ++# define QLOGGING_HAVE_BACKTRACE ++# include <qregularexpression.h> ++# include <cxxabi.h> ++# include <execinfo.h> ++# endif + #endif + + #include <stdio.h> +-- +1.9.1 + |
