Merge branch 'Plasma/5.2'

applets/batterymonitor/package/contents/ui/batterymonitor.qml

@@ -42,10 +42,10 @@ Item {
     property bool disableBrightnessUpdate: false
 
     property int screenBrightness
-    readonly property int maximumScreenBrightness: pmSource.data["PowerDevil"] ? pmSource.data["PowerDevil"]["Maximum Screen Brightness"] : 0
+    readonly property int maximumScreenBrightness: pmSource.data["PowerDevil"] ? pmSource.data["PowerDevil"]["Maximum Screen Brightness"] || 0 : 0
 
     property int keyboardBrightness
-    readonly property int maximumKeyboardBrightness: pmSource.data["PowerDevil"] ? pmSource.data["PowerDevil"]["Maximum Keyboard Brightness"] : 0
+    readonly property int maximumKeyboardBrightness: pmSource.data["PowerDevil"] ? pmSource.data["PowerDevil"]["Maximum Keyboard Brightness"] || 0 : 0
 
     readonly property int remainingTime: Number(pmSource.data["Battery"]["Remaining msec"])
 

applets/notifications/package/contents/ui/NotificationItem.qml

@@ -196,7 +196,7 @@ Item {
         }
         height: childrenRect.height
         spacing: units.smallSpacing
-        visible: notificationItem.actions.count > 0
+        visible: notificationItem.actions && notificationItem.actions.count > 0
 
         Repeater {
             id: actionRepeater