mirror of
https://github.com/thead-yocto-mirror/meta-qt5
synced 2026-09-07 06:34:39 +02:00
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>
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user