Merge branch 'Plasma/5.3'

applets/digital-clock/package/contents/ui/CalendarView.qml

@@ -69,7 +69,7 @@ Item {
         PlasmaCalendar.MonthView {
             id: monthView
             borderOpacity: 0.25
-            today: main.tzDate
+            today: root.tzDate
             anchors.fill: parent
         }
 

applets/digital-clock/package/contents/ui/DigitalClock.qml

@@ -403,7 +403,7 @@ Item {
     }
 
     function updateToolTip() {
-        var timezoneString = Qt.formatDate(main.tzDate, dateFormatString);
+        var timezoneString = Qt.formatDate(root.tzDate, root.dateFormatString);
         if (plasmoid.configuration.selectedTimeZones.length > 1) {
             timezoneString += "<br />";
             for (var i = 0; i < plasmoid.configuration.selectedTimeZones.length; ++i) {

applets/digital-clock/package/contents/ui/main.qml

@@ -26,7 +26,7 @@ import org.kde.plasma.private.digitalclock 1.0
 //import org.kde.plasma.calendar 2.0
 
 Item {
-    id: main
+    id: root
 
     width: units.gridUnit * 10
     height: units.gridUnit * 4
@@ -73,7 +73,7 @@ Item {
         // remove it + the delimiter and space
         var format = Qt.locale().dateFormat(Locale.LongFormat);
         format = format.replace(/(^dddd.?\s)|(,?\sdddd$)/, "");
-        main.dateFormatString = format;
+        return format;
     }
 
     function action_formatskcm() {