From 09e73292aa3e1d07d531d01bcdd086ab6b7801e7 Mon Sep 17 00:00:00 2001 From: Kai Uwe Broulik Date: Fri, 19 Jun 2020 17:53:55 +0200 Subject: [PATCH] [Notifications] Support description where only a value is set BUG: 423218 FIXED-IN: 5.19.2 --- applets/notifications/package/contents/ui/JobDetails.qml | 3 +-- libnotificationmanager/job_p.cpp | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/applets/notifications/package/contents/ui/JobDetails.qml b/applets/notifications/package/contents/ui/JobDetails.qml index b9b68f6b0..ed1b6174b 100644 --- a/applets/notifications/package/contents/ui/JobDetails.qml +++ b/applets/notifications/package/contents/ui/JobDetails.qml @@ -79,8 +79,7 @@ GridLayout { Component.onCompleted: bindText() function bindText() { text = Qt.binding(function() { - return jobDetails["descriptionLabel" + modelData] && jobDetails["descriptionValue" + modelData] - ? jobDetails["descriptionValue" + modelData] : ""; + return jobDetails["descriptionValue" + modelData] || ""; }); } diff --git a/libnotificationmanager/job_p.cpp b/libnotificationmanager/job_p.cpp index 7015af4e3..62df19a0e 100644 --- a/libnotificationmanager/job_p.cpp +++ b/libnotificationmanager/job_p.cpp @@ -134,8 +134,6 @@ void JobPrivate::updateHasDetails() || m_processedBytes > 0 || m_processedFiles > 0 || m_processedDirectories > 0 - || !m_descriptionLabel1.isEmpty() - || !m_descriptionLabel2.isEmpty() || !m_descriptionValue1.isEmpty() || !m_descriptionValue2.isEmpty() || m_speed > 0;