diff options
Diffstat (limited to 'recipes-qt/qt5/qtbase/0023-build-failure-with-clang.patch')
| -rw-r--r-- | recipes-qt/qt5/qtbase/0023-build-failure-with-clang.patch | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/recipes-qt/qt5/qtbase/0023-build-failure-with-clang.patch b/recipes-qt/qt5/qtbase/0023-build-failure-with-clang.patch deleted file mode 100644 index 0576a22c..00000000 --- a/recipes-qt/qt5/qtbase/0023-build-failure-with-clang.patch +++ /dev/null | |||
| @@ -1,48 +0,0 @@ | |||
| 1 | From f958dccc8c7c777aaca1f110ed48c71b28fdea92 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Fri, 1 Mar 2019 15:11:19 -0800 | ||
| 4 | Subject: [PATCH] Fix build failure with clang | ||
| 5 | |||
| 6 | Complement below commit | ||
| 7 | |||
| 8 | commit 1555894dec537cbc422f43fe959b0d0ee0000881 | ||
| 9 | Author: Thiago Macieira <thiago.macieira@intel.com> | ||
| 10 | Date: Wed Jul 25 19:04:20 2018 -0700 | ||
| 11 | |||
| 12 | QCborValue: Disable support for spaceship operator | ||
| 13 | |||
| 14 | __has_include(<compare>) is not the correct way to detect this feature, | ||
| 15 | since that's a library header and may be provided by an implementation | ||
| 16 | (libc++) before the compiler supports the syntax. | ||
| 17 | |||
| 18 | Change-Id: I80aae0d068974d83b6c0fffd1544c8e558e2446b | ||
| 19 | Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> | ||
| 20 | |||
| 21 | Fixes | ||
| 22 | tst_qcborvalue.cpp:336:17: error: invalid operands to binary expression ('QCborValue' and 'QCborValue') | ||
| 23 | QVERIFY(!(v > other)); | ||
| 24 | ~ ^ ~~~~~ | ||
| 25 | |||
| 26 | Upstream-Status: Pending | ||
| 27 | |||
| 28 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 29 | --- | ||
| 30 | tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp | 2 +- | ||
| 31 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 32 | |||
| 33 | diff --git a/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp b/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp | ||
| 34 | index 38b26e7de4..4b753eab6b 100644 | ||
| 35 | --- a/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp | ||
| 36 | +++ b/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp | ||
| 37 | @@ -330,7 +330,7 @@ void tst_QCborValue::copyCompare() | ||
| 38 | QCOMPARE(v, other); | ||
| 39 | QVERIFY(!(v != other)); | ||
| 40 | QVERIFY(!(v < other)); | ||
| 41 | -#if QT_HAS_INCLUDE(<compare>) | ||
| 42 | +#if 0 && QT_HAS_INCLUDE(<compare>) | ||
| 43 | QVERIFY(v <= other); | ||
| 44 | QVERIFY(v >= other); | ||
| 45 | QVERIFY(!(v > other)); | ||
| 46 | -- | ||
| 47 | 2.21.0 | ||
| 48 | |||
