diff options
| author | Robert Griebl <robert.griebl@qt.io> | 2021-04-22 15:50:58 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-04-26 08:25:01 +0000 |
| commit | 5309c184f0b91bc6a03c8e1ca7b83261b63a5f1b (patch) | |
| tree | 36d0b1023bf32f9b8ff66b08d7b3273ddb843517 | |
| parent | 0f201ccf9fe116a1bcb671f22c6321ef678ad604 (diff) | |
Correctly handle null values in system- and applicationProperties over DBus
Change-Id: Ifc53b751a94f0b13b8b9e34d76b3215ec336d93d
Fixes: AUTOSUITE-1641
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
(cherry picked from commit ba7ba4cfa25eee93d4d7e76862e434b338b9d90a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | examples/applicationmanager/minidesk/am-config.yaml | 1 | ||||
| -rw-r--r-- | src/dbus-lib/applicationmanagerdbuscontextadaptor.cpp | 2 | ||||
| -rw-r--r-- | src/manager-lib/nativeruntime.cpp | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/examples/applicationmanager/minidesk/am-config.yaml b/examples/applicationmanager/minidesk/am-config.yaml index 376a2265..b7bb3867 100644 --- a/examples/applicationmanager/minidesk/am-config.yaml +++ b/examples/applicationmanager/minidesk/am-config.yaml @@ -28,6 +28,7 @@ ui: systemProperties: protected: light: on + nullValueCrashCheckOnDBus: ~ # development setup: flags: diff --git a/src/dbus-lib/applicationmanagerdbuscontextadaptor.cpp b/src/dbus-lib/applicationmanagerdbuscontextadaptor.cpp index e050dc33..cfa2a1de 100644 --- a/src/dbus-lib/applicationmanagerdbuscontextadaptor.cpp +++ b/src/dbus-lib/applicationmanagerdbuscontextadaptor.cpp @@ -116,7 +116,7 @@ bool ApplicationManagerAdaptor::singleProcess() const QVariantMap ApplicationManagerAdaptor::systemProperties() const { - return ApplicationManager::instance()->systemProperties(); + return convertFromJSVariant(ApplicationManager::instance()->systemProperties()).toMap(); } QStringList ApplicationManagerAdaptor::applicationIds() diff --git a/src/manager-lib/nativeruntime.cpp b/src/manager-lib/nativeruntime.cpp index 408efa3e..9c623212 100644 --- a/src/manager-lib/nativeruntime.cpp +++ b/src/manager-lib/nativeruntime.cpp @@ -541,14 +541,14 @@ QString NativeRuntimeApplicationInterface::version() const QVariantMap NativeRuntimeApplicationInterface::systemProperties() const { if (m_runtime) - return m_runtime->systemProperties(); + return convertFromJSVariant(m_runtime->systemProperties()).toMap(); return QVariantMap(); } QVariantMap NativeRuntimeApplicationInterface::applicationProperties() const { if (m_runtime && m_runtime->application()) - return m_runtime->application()->info()->allAppProperties(); + return convertFromJSVariant(m_runtime->application()->info()->allAppProperties()).toMap(); return QVariantMap(); } |