diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-02-22 14:15:12 +0000 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-02-26 16:53:07 +0000 |
| commit | 1d9fbb1576846318e6f842006bf8c27758f094fb (patch) | |
| tree | 772f2b404ce6bb3c7c06bd381ccc72aa3efa741e /recipes-qt/qt5/qtserialbus | |
| parent | a5aadb7a92558ea33833a189cc6b6fd1019c2a5b (diff) | |
qt5: refresh patches from meta-qt5/qt* repos
* apply:
0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch
also for nativesdk-qtbase as the comment says
* drop unused:
0001-Add-missing-include-for-struct-timeval.patch
which wasn't removed in 5.10.1 upgrade
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtserialbus')
| -rw-r--r-- | recipes-qt/qt5/qtserialbus/0001-Add-missing-include-for-struct-timeval.patch | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/recipes-qt/qt5/qtserialbus/0001-Add-missing-include-for-struct-timeval.patch b/recipes-qt/qt5/qtserialbus/0001-Add-missing-include-for-struct-timeval.patch deleted file mode 100644 index 519749ec..00000000 --- a/recipes-qt/qt5/qtserialbus/0001-Add-missing-include-for-struct-timeval.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 3c9a3e3bdb220c6aacee1db04a3f997e08dab161 Mon Sep 17 00:00:00 2001 -From: Samuli Piippo <samuli.piippo@qt.io> -Date: Mon, 11 Dec 2017 14:39:34 +0200 -Subject: [PATCH] Add missing include for struct timeval - -Fix build failure with musl libc: -socketcanbackend.h:88:38: error: 'timeval' was not declared in this scope - -Change-Id: I4089f5a906095c21b2790d35ad131d9a0713ff3b ---- - src/plugins/canbus/socketcan/socketcanbackend.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/plugins/canbus/socketcan/socketcanbackend.h b/src/plugins/canbus/socketcan/socketcanbackend.h -index 50976b1..b49d267 100644 ---- a/src/plugins/canbus/socketcan/socketcanbackend.h -+++ b/src/plugins/canbus/socketcan/socketcanbackend.h -@@ -50,6 +50,7 @@ - #include <sys/socket.h> - #include <sys/uio.h> - #include <linux/can.h> -+#include <sys/time.h> - - QT_BEGIN_NAMESPACE - |