diff options
author | Jani Suonpera <jani.suonpera@qt.io> | 2020-11-25 15:38:29 +0200 |
---|---|---|
committer | Jani Suonpera <jani.suonpera@qt.io> | 2020-12-04 09:43:52 +0200 |
commit | 19d99b10df41b7875b3c788bc7a9d1a88734e644 (patch) | |
tree | dc987a79b9ad1810bedfa8221533b550cf1662cc /recipes-connectivity/libconnman-qt/libconnman-qt5/0001-Add-missing-declarations-for-operator-overloads.patch | |
parent | 545be38961a2e287c64f2ae607569e88da4bfa8b (diff) | |
parent | 7a9f639fbd632dbe23af95c7b8123a0b907c6179 (diff) |
Merge remote-tracking branch 'qt/upstream/master' into 5.15
Task-number: QTBUG-88755
Change-Id: I7adf9d6bb5fb8a2b0893d1c4b142db73996f20b9
Diffstat (limited to 'recipes-connectivity/libconnman-qt/libconnman-qt5/0001-Add-missing-declarations-for-operator-overloads.patch')
-rw-r--r-- | recipes-connectivity/libconnman-qt/libconnman-qt5/0001-Add-missing-declarations-for-operator-overloads.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/recipes-connectivity/libconnman-qt/libconnman-qt5/0001-Add-missing-declarations-for-operator-overloads.patch b/recipes-connectivity/libconnman-qt/libconnman-qt5/0001-Add-missing-declarations-for-operator-overloads.patch new file mode 100644 index 00000000..1f7ec0c8 --- /dev/null +++ b/recipes-connectivity/libconnman-qt/libconnman-qt5/0001-Add-missing-declarations-for-operator-overloads.patch @@ -0,0 +1,31 @@ +From 09fcee5c5750a3345e4378cd462cbb9aeba5e269 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 11 Aug 2020 22:20:17 -0700 +Subject: [PATCH] Add missing declarations for operator overloads + +This fixes clang-11 errors e.g. + +| ../../recipe-sysroot/usr/include/QtDBus/qdbusargument.h:276:13: error: invalid operands to binary expression ('const QDBusArgument' and 'RouteStructure') +| arg >> item; +| ~~~ ^ ~~~~ + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + libconnman-qt/marshalutils.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/libconnman-qt/marshalutils.cpp ++++ b/libconnman-qt/marshalutils.cpp +@@ -36,6 +36,11 @@ + + #include "marshalutils.h" + ++#if defined(__clang__) && __clang_major__ >= 11 ++Q_DBUS_EXPORT const QDBusArgument &operator>>(const QDBusArgument &a, RouteStructure &v); ++Q_DBUS_EXPORT QDBusArgument &operator<<(QDBusArgument &a, const RouteStructure &v); ++#endif ++ + // Empty namespace for local static functions + namespace { + |