mirror of
https://github.com/thead-yocto-mirror/meta-qt5
synced 2026-06-21 08:52:35 +02:00
libconnman-qt5: Drop patch that was merged upstream & qt6 support
A modified version of the patch was merged upstream which has been confirmed to be working with GCC12, so I expect it will work with clang too. Qt6 support has been added as well. Signed-off-by: Herman van Hazendonk <github.com@herrie.org>
This commit is contained in:
committed by
Martin Jansa
parent
9368599498
commit
1c693f7cc1
@@ -1,31 +0,0 @@
|
||||
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 || __GNUC__ >= 12
|
||||
+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 {
|
||||
|
||||
@@ -1,15 +1,14 @@
|
||||
require recipes-qt/qt5/qt5.inc
|
||||
|
||||
SUMMARY = "Qt Library for ConnMan"
|
||||
SUMMARY = "Qt 5/6 Library for ConnMan"
|
||||
HOMEPAGE = "https://github.com/sailfishos/libconnman-qt"
|
||||
LICENSE = "Apache-2.0"
|
||||
LIC_FILES_CHKSUM = "file://libconnman-qt/clockmodel.h;endline=8;md5=ea9f724050803f15d2d900ce3c5dac88"
|
||||
DEPENDS += "qtbase qtdeclarative"
|
||||
PV = "1.2.45+git${SRCPV}"
|
||||
PV = "1.2.46+git${SRCPV}"
|
||||
|
||||
SRCREV = "1b1ef5693218b3e4f398a320b91ab84ea38d87d7"
|
||||
SRCREV = "6786936cba9048ee943c0cd5d051c0b8fc70896f"
|
||||
SRC_URI = "git://github.com/sailfishos/libconnman-qt.git;protocol=https;branch=master \
|
||||
file://0001-Add-missing-declarations-for-operator-overloads.patch \
|
||||
"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
Reference in New Issue
Block a user