diff options
| author | Eskil Abrahamsen Blomfeldt <[email protected]> | 2017-09-26 07:31:48 +0200 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <[email protected]> | 2017-09-26 05:57:33 +0000 |
| commit | c0dbf5da64e6fc20d6edc59cc849e282e9bfea50 (patch) | |
| tree | 8df479e3d174020d6685439262c4dad9128349e5 | |
| parent | c7a43a5d3d34ff0d7f1f8d88750643ffa8195efb (diff) | |
Add internal types to Android styles qmldirv5.10.0-beta1
In order for types in a module to be available inside the module
itself, but not to external types, they need to be marked as
internal in the qmldir. This has worked by accident before, but
stopped working after 22a2cc43387ec3b9f74a6c01f8665378a4541147
in qtdeclarative, at which point no Qt Quick Controls applications
would run on Android.
Note that there is also a change needed in qtdeclarative, in order
to support implicit loading of internal types even when there is
an explicit import of the module (needed to get access to the
singleton).
Task-number: QTBUG-63309
Change-Id: I36b9ce9fa8f55c4da1f5e64c8fed120e9913bc85
Reviewed-by: Simon Hausmann <[email protected]>
| -rw-r--r-- | src/controls/Styles/Android/qmldir | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/src/controls/Styles/Android/qmldir b/src/controls/Styles/Android/qmldir index 21bff6919..d07efdb6d 100644 --- a/src/controls/Styles/Android/qmldir +++ b/src/controls/Styles/Android/qmldir @@ -2,3 +2,28 @@ module QtQuick.Controls.Styles.Android plugin qtquickcontrolsandroidstyleplugin classname QtQuickControlsAndroidStylePlugin singleton AndroidStyle 1.0 AndroidStyle.qml +internal ApplicationWindowStyle ApplicationWindowStyle.qml +internal BusyIndicatorStyle BusyIndicatorStyle.qml +internal ButtonStyle ButtonStyle.qml +internal CalendarStyle CalendarStyle.qml +internal CheckBoxStyle CheckBoxStyle.qml +internal ComboBoxStyle ComboBoxStyle.qml +internal CursorHandleStyle CursorHandleStyle.qml +internal FocusFrameStyle FocusFrameStyle.qml +internal GroupBoxStyle GroupBoxStyle.qml +internal LabelStyle LabelStyle.qml +internal MenuBarStyle MenuBarStyle.qml +internal MenuStyle MenuStyle.qml +internal ProgressBarStyle ProgressBarStyle.qml +internal RadioButtonStyle RadioButtonStyle.qml +internal ScrollViewStyle ScrollViewStyle.qml +internal SliderStyle SliderStyle.qml +internal SpinBoxStyle SpinBoxStyle.qml +internal StatusBarStyle StatusBarStyle.qml +internal SwitchStyle SwitchStyle.qml +internal TableViewStyle TableViewStyle.qml +internal TabViewStyle TabViewStyle.qml +internal TextAreaStyle TextAreaStyle.qml +internal TextFieldStyle TextFieldStyle.qml +internal ToolBarStyle ToolBarStyle.qml +internal ToolButtonStyle ToolButtonStyle.qml |