3 files changed, 37 insertions, 13 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 {
+ 
diff --git a/recipes-connectivity/libconnman-qt/libconnman-qt5/0001-Don-t-use-MeeGo-as-prefix-in-order-to-make-this-a-co.patch b/recipes-connectivity/libconnman-qt/libconnman-qt5/0001-Don-t-use-MeeGo-as-prefix-in-order-to-make-this-a-co.patch
index 7a67c744..028e3f5c 100644
--- a/recipes-connectivity/libconnman-qt/libconnman-qt5/0001-Don-t-use-MeeGo-as-prefix-in-order-to-make-this-a-co.patch
+++ b/recipes-connectivity/libconnman-qt/libconnman-qt5/0001-Don-t-use-MeeGo-as-prefix-in-order-to-make-this-a-co.patch
@@ -12,11 +12,9 @@ Signed-off-by: Herman van Hazendonk <github.com@herrie.org>
  plugin/qmldir     | 2 +-
  3 files changed, 3 insertions(+), 3 deletions(-)
 
-diff --git a/plugin/plugin.cpp b/plugin/plugin.cpp
-index a383482..451c95f 100644
 --- a/plugin/plugin.cpp
 +++ b/plugin/plugin.cpp
-@@ -24,7 +24,7 @@
+@@ -34,7 +34,7 @@ static QObject *singleton_api_factory(QQ
  class ConnmanPlugin: public QQmlExtensionPlugin
  {
      Q_OBJECT
@@ -25,27 +23,21 @@ index a383482..451c95f 100644
  
  public:
      void registerTypes(const char *uri);
-diff --git a/plugin/plugin.pro b/plugin/plugin.pro
-index c4f54cf..3763f57 100644
 --- a/plugin/plugin.pro
 +++ b/plugin/plugin.pro
-@@ -17,7 +17,7 @@ LIBS += -l$$qtLibraryTarget(connman-$$TARGET_SUFFIX)
+@@ -17,7 +17,7 @@ LIBS += -l$$qtLibraryTarget(connman-$$TA
  QT += qml
- OTHER_FILES += plugin.json qmldirs
+ OTHER_FILES += plugin.json plugins.qmltypes qmldirs
  
 -MODULENAME = MeeGo/Connman
 +MODULENAME = Connman
  TARGETPATH = $$[QT_INSTALL_QML]/$$MODULENAME
  
  target.path = $$TARGETPATH
-diff --git a/plugin/qmldir b/plugin/qmldir
-index 5db82b7..de56688 100644
 --- a/plugin/qmldir
 +++ b/plugin/qmldir
-@@ -1,2 +1,2 @@
+@@ -1,3 +1,3 @@
 -module MeeGo.Connman
 +module Connman
  plugin ConnmanQtDeclarative
--- 
-2.11.0.windows.3
-
+ typeinfo plugins.qmltypes
diff --git a/recipes-connectivity/libconnman-qt/libconnman-qt5_git.bb b/recipes-connectivity/libconnman-qt/libconnman-qt5_git.bb
index 06e3bbd4..bc84224e 100644
--- a/recipes-connectivity/libconnman-qt/libconnman-qt5_git.bb
+++ b/recipes-connectivity/libconnman-qt/libconnman-qt5_git.bb
@@ -10,6 +10,7 @@ PV = "1.2.34+git${SRCPV}"
 SRCREV = "a0b6b0d9a63f28ab41747892f415c89866d62e4a"
 SRC_URI = "git://git.merproject.org/mer-core/libconnman-qt.git;protocol=https \
     file://0001-Don-t-use-MeeGo-as-prefix-in-order-to-make-this-a-co.patch \
+    file://0001-Add-missing-declarations-for-operator-overloads.patch \
 "
 
 S = "${WORKDIR}/git"