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/0002-logging-Check-if-uClibc-has-backtrace-support.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/0002-logging-Check-if-uClibc-has-backtrace-support.patch')
| -rw-r--r-- | package/qt5/qt5base/0002-logging-Check-if-uClibc-has-backtrace-support.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/package/qt5/qt5base/0002-logging-Check-if-uClibc-has-backtrace-support.patch b/package/qt5/qt5base/0002-logging-Check-if-uClibc-has-backtrace-support.patch new file mode 100644 index 0000000000..7d884adc74 --- /dev/null +++ b/package/qt5/qt5base/0002-logging-Check-if-uClibc-has-backtrace-support.patch @@ -0,0 +1,48 @@ +From 9f03adc74fa06e9559e8bb85f1cfd942397328b5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= <fatih.asici@gmail.com> +Date: Wed, 24 Dec 2014 17:29:11 +0200 +Subject: [PATCH] logging: Check if uClibc has backtrace support + +execinfo.h is optional in uClibc. We need to check +__UCLIBC_HAS_BACKTRACE__ if uClibc is used. + +Change-Id: Ie28be85b0b70472df1fc4a208581bb66ad34229e +Sent-Upstream: https://codereview.qt-project.org/#/c/102628/ +Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com> +--- + src/corelib/global/qlogging.cpp | 15 +++++++++++---- + 1 file changed, 11 insertions(+), 4 deletions(-) + +diff --git a/src/corelib/global/qlogging.cpp b/src/corelib/global/qlogging.cpp +index 50d35a6..fa897d6 100644 +--- a/src/corelib/global/qlogging.cpp ++++ b/src/corelib/global/qlogging.cpp +@@ -77,14 +77,21 @@ + #endif + + #if !defined QT_NO_REGULAREXPRESSION && !defined(QT_BOOTSTRAPPED) +-# if (defined(__GLIBC__) && defined(__GLIBCXX__)) || (__has_include(<cxxabi.h>) && __has_include(<execinfo.h>)) ++# ifdef __UCLIBC__ ++# if __UCLIBC_HAS_BACKTRACE__ ++# define QLOGGING_HAVE_BACKTRACE ++# endif ++# elif (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 + ++#ifdef QLOGGING_HAVE_BACKTRACE ++# include <qregularexpression.h> ++# include <cxxabi.h> ++# include <execinfo.h> ++#endif ++ + #include <stdio.h> + + QT_BEGIN_NAMESPACE +-- +1.9.1 + |
