diff options
| author |   Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2018-04-24 15:15:42 +0200 |
|---|---|---|
| committer | Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2018-04-28 00:29:25 +0200 |
| commit | b1ee9d6cb0f28ba3dc5b35be97cd9507c39ede48 (patch) | |
| tree | 2fe9ee45196c6fa8ee907503dc2bb1495489087c /recipes-qt/qt5/qtbase/0001-Force-qdbus-to-make-introspect-for-every-findMetaObj.patch | |
| parent | 8885505217f4180eb82ffc3ac8b0b9a24f5036b5 (diff) | |
2nd part of the layer/profile rework [2/2]
Main goal of this is to move the agl-service-* bindings into the core and to
unify common recipes like wayland/weston into meta-agl-profile-graphical.
As a placeholder for recipes is meta-agl-profile-demo which are being reshuffled.
TLDR: remove recipes from meta-agl-demo that were moved to other layers
Bug-AGL: SPEC-145 , SPEC-876 , SPEC-877
v2: moving updated udisks changes to meta-agl
Change-Id: I873107f00adadeb6f3f266cce37b513fe6d44cf2
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'recipes-qt/qt5/qtbase/0001-Force-qdbus-to-make-introspect-for-every-findMetaObj.patch')
| -rw-r--r-- | recipes-qt/qt5/qtbase/0001-Force-qdbus-to-make-introspect-for-every-findMetaObj.patch | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/recipes-qt/qt5/qtbase/0001-Force-qdbus-to-make-introspect-for-every-findMetaObj.patch b/recipes-qt/qt5/qtbase/0001-Force-qdbus-to-make-introspect-for-every-findMetaObj.patch deleted file mode 100644 index 10a1ddd88..000000000 --- a/recipes-qt/qt5/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 - |