From 4f43c236e34e2fbd092116cf778971751a707945 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Sat, 30 Sep 2017 19:08:33 +0200 Subject: [PATCH] Fix org.kde.plasma.calendar with Qt 5.10 Summary: Module internal types are not implicitly available anymore simply by placing them inside the module's main directory. It is now necessary to mention them as internal types in the qmldir file. See qtdeclarative commits 22a2cc43387ec3b9f74a6c01f8665378a4541147 (introduced the change) and 930aea8b9ca59a24838cf7f279653e3b2ee40cee (explanation) Test Plan: Built whole stack with Qt 5.10. The digital clock plasmoid does not load due to the DaysCalendar type not being available. With these changes to qmldir and a reload of the plasmoid it works. Reviewers: #plasma, broulik Reviewed By: #plasma, broulik Subscribers: broulik, #frameworks, plasma-devel Tags: #plasma, #frameworks Differential Revision: https://phabricator.kde.org/D8077 --- src/declarativeimports/calendar/qml/qmldir | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/declarativeimports/calendar/qml/qmldir b/src/declarativeimports/calendar/qml/qmldir index b86a88c1f..2fcc910b8 100644 --- a/src/declarativeimports/calendar/qml/qmldir +++ b/src/declarativeimports/calendar/qml/qmldir @@ -3,3 +3,6 @@ plugin calendarplugin MonthView 2.0 MonthView.qml MonthMenu 2.0 MonthMenu.qml +internal CalendarToolbar CalendarToolbar.qml +internal DayDelegate DayDelegate.qml +internal DaysCalendar DaysCalendar.qml