diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-12-22 16:45:50 +0000 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-12-23 19:40:35 +0000 |
| commit | 77edae59c3fae1e0f23fced2e7c0ce206ff64065 (patch) | |
| tree | 02a3b89cb9f5a2597861792b502933a85e9c37e3 /recipes-qt/qt5 | |
| parent | d45b966b4612fe59ac3c53e0f7a3c480d29b2fbe (diff) | |
qtconnectivity: drop patch resolved upstream
* resolved in upstream commit:
commit 2a52a400d6692b4f42d955302dee651646664385
Author: Alex Blasche <alexander.blasche@qt.io>
Date: Wed Aug 29 10:02:58 2018 +0200
Fix bluez config test failure on clang
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5')
| -rw-r--r-- | recipes-qt/qt5/qtconnectivity/0001-Ignore-clang-warning-about-address-of-temp-in-config.patch | 40 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtconnectivity_git.bb | 2 |
2 files changed, 0 insertions, 42 deletions
diff --git a/recipes-qt/qt5/qtconnectivity/0001-Ignore-clang-warning-about-address-of-temp-in-config.patch b/recipes-qt/qt5/qtconnectivity/0001-Ignore-clang-warning-about-address-of-temp-in-config.patch deleted file mode 100644 index a0c2ee72..00000000 --- a/recipes-qt/qt5/qtconnectivity/0001-Ignore-clang-warning-about-address-of-temp-in-config.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 162749d36f4bdea62d456516ae2bbcdc84b9ba87 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 6 Dec 2018 13:21:23 -0800 -Subject: [PATCH] Ignore clang warning about address of temp in - config.tests/bluez - -There is a similar error with gcc which is suppressed by using --fpermissive, clang however is more concerned and has specific flag for -it, this flag is not implemented in gcc so we can not use it via general -cmdline options to compiler, so resort to using diagnostic pragma - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - config.tests/bluez/main.cpp | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/config.tests/bluez/main.cpp b/config.tests/bluez/main.cpp -index 3fe5ee09..8d1c968a 100644 ---- a/config.tests/bluez/main.cpp -+++ b/config.tests/bluez/main.cpp -@@ -30,11 +30,14 @@ - - int main() - { -+#pragma clang diagnostic push -+#pragma clang diagnostic ignored "-Waddress-of-temporary" - #ifdef BDADDR_NONE - bacmp(BDADDR_ANY, BDADDR_NONE); - #else - bacmp(BDADDR_ANY, BDADDR_LOCAL); - #endif -+#pragma clang diagnostic pop - - return 0; - } --- -2.19.2 - diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index edf93a9f..f2e00751 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb @@ -20,5 +20,3 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,${BLUEZ}" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" SRCREV = "e9967647ffe20df0473a1fa9eb10957b4e32fbf3" - -SRC_URI += "file://0001-Ignore-clang-warning-about-address-of-temp-in-config.patch" |