Commit c4c75de1 authored by Florent Revest's avatar Florent Revest

mapplauncherd-qt: Share same mdeclarativecache_pre_initialized_qapplication for each qmlcache

parent 033d354d
From d106c0397438c14cc450c20f8a7adbe83bb13a86 Mon Sep 17 00:00:00 2001
From: Florent Revest <revestflo@gmail.com>
Date: Mon, 12 Jun 2017 02:02:45 +0200
Subject: [PATCH] mdeclarativecache5: Share same
mdeclarativecache_pre_initialized_qapplication for each qmlcache
---
mdeclarativecache5/mdeclarativecache.cpp | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/mdeclarativecache5/mdeclarativecache.cpp b/mdeclarativecache5/mdeclarativecache.cpp
index 622eac9..73ccdc8 100644
--- a/mdeclarativecache5/mdeclarativecache.cpp
+++ b/mdeclarativecache5/mdeclarativecache.cpp
@@ -61,13 +61,7 @@ void MDeclarativeCachePrivate::populate()
cachePopulated = true;
static const char *const emptyString = "";
- static const QString appNameFormat = "mdeclarativecache_pre_initialized_qapplication-%1";
- static QByteArray appName;
-
- // Append pid to appName to make it unique. This is required because the
- // libminputcontext.so instantiates MComponentData, which in turn registers
- // a dbus service with the application's name.
- appName = appNameFormat.arg(getpid()).toLatin1();
+ static QByteArray appName = "mdeclarativecache_pre_initialized_qapplication";
// We support at most ARGV_LIMIT arguments in QCoreApplication. These will be set when real
// arguments are known (in MDeclarativeCachePrivate::qApplication).
--
2.7.4
......@@ -4,6 +4,7 @@ LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://qtbooster/qtbooster.cpp;beginline=1;endline=18;md5=fb70bd5bb640878875111d8161fa303c"
SRC_URI = "git://git.merproject.org/mer-core/mapplauncherd-qt.git;protocol=https \
file://0001-mdeclarativecache5-Share-same-mdeclarativecache_pre_.patch
file://booster-qt5.service"
SRCREV = "8c2d34f64c7e21bcf394e937e71361da51e6077c"
PR = "r1"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment