diff options
author | Scott Murray <scott.murray@konsulko.com> | 2021-06-07 18:00:21 -0400 |
---|---|---|
committer | Scott Murray <scott.murray@konsulko.com> | 2021-06-07 18:00:21 -0400 |
commit | 4aa8929cbe66c18a6f24d1cffad3b14d58682af1 (patch) | |
tree | 62a576a7998bab24989ed525074e5b679f8ee9c7 /recipes-qt/qt/qtbase | |
parent | 4eb431f926aa9544f9aa6f6bb2a063ef3c7ca82d (diff) |
qtbase: clean up bbappend
Changes:
- With the Wayland enabling changes being shifted to meta-agl-core,
remove the duplicate ones from the bbappend here.
- Also remove unused patch and disabled qtbase-native bbappend, as
neither seem required at this point.
Bug-AGL: SPEC-3972
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I3ac3a4fa1ec9de235ff1e35e063f1e35a362e5d1
Diffstat (limited to 'recipes-qt/qt/qtbase')
-rw-r--r-- | recipes-qt/qt/qtbase/0001-Force-qdbus-to-make-introspect-for-every-findMetaObj.patch | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/recipes-qt/qt/qtbase/0001-Force-qdbus-to-make-introspect-for-every-findMetaObj.patch b/recipes-qt/qt/qtbase/0001-Force-qdbus-to-make-introspect-for-every-findMetaObj.patch deleted file mode 100644 index 10a1ddd88..000000000 --- a/recipes-qt/qt/qtbase/0001-Force-qdbus-to-make-introspect-for-every-findMetaObj.patch +++ /dev/null @@ -1,30 +0,0 @@ -From a4943bb5c7fdf5eb297223d2c3bb02d2271bea48 Mon Sep 17 00:00:00 2001 -From: Risto Avila <risto.avila@theqtcompany.com> -Date: Thu, 17 Dec 2015 04:22:53 +0200 -Subject: [PATCH] Force qdbus to make introspect for every findMetaObject - ---- - src/dbus/qdbusintegrator.cpp | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp -index cce8b9c..ae2a9dc 100644 ---- a/src/dbus/qdbusintegrator.cpp -+++ b/src/dbus/qdbusintegrator.cpp -@@ -2512,8 +2512,11 @@ QDBusConnectionPrivate::findMetaObject(const QString &service, const QString &pa - if (!interface.isEmpty()) { - QDBusReadLocker locker(FindMetaObject1Action, this); - QDBusMetaObject *mo = cachedMetaObjects.value(interface, 0); -- if (mo) -- return mo; -+ if (mo) { -+ // service is not unique. Remove cached object to force introspect -+ cachedMetaObjects.remove(interface); -+ delete mo; -+ } - } - - // introspect the target object --- -1.9.1 - |