From 7d0b38106105920e9251f3d374af6d1f584f89d6 Mon Sep 17 00:00:00 2001 From: David Edmundson Date: Fri, 26 Aug 2016 03:14:36 +0100 Subject: [PATCH] Fix cannot assign undefined to double warning in DayDelegate REVIEW: 128765 --- src/declarativeimports/calendar/qml/DayDelegate.qml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/declarativeimports/calendar/qml/DayDelegate.qml b/src/declarativeimports/calendar/qml/DayDelegate.qml index eeb05b5ba..ddd148905 100644 --- a/src/declarativeimports/calendar/qml/DayDelegate.qml +++ b/src/declarativeimports/calendar/qml/DayDelegate.qml @@ -124,9 +124,10 @@ MouseArea { elide: Text.ElideRight fontSizeMode: Text.HorizontalFit font.pixelSize: Math.max(theme.smallestFont.pixelSize, Math.floor(daysCalendar.cellHeight / 3)) - // This is to avoid the "Both point size and - // pixel size set. Using pixel size" warnings - font.pointSize: undefined + // Plasma component set point size, this code wants to set pixel size + // Setting both results in a warning + // -1 is an undocumented same as unset (see qquickvaluetypes) + font.pointSize: -1 color: today ? theme.backgroundColor : theme.textColor Behavior on color { ColorAnimation { duration: units.shortDuration * 2 }