diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-27 03:00:41 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-27 03:00:41 +0200 |
| commit | cbe9f582b7555351c2f6af76e4ab4d01ee6f224f (patch) | |
| tree | 8c124ef98bd66ef69e1fdeccb80a14c50ea04006 /src/settingsui/settingsuiapp.qrc | |
| parent | a732c85a69bcc13cd8dd6ea1c0b047fdc4c03187 (diff) | |
| parent | 3485589dc6d952f6bc9c52034b7f041ae8954f88 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Ieccf7c09a854bd3b84dd5c7d0fe97df867da7ea5
Diffstat (limited to 'src/settingsui/settingsuiapp.qrc')
| -rw-r--r-- | src/settingsui/settingsuiapp.qrc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/settingsui/settingsuiapp.qrc b/src/settingsui/settingsuiapp.qrc index a3e7ca5..110cf83 100644 --- a/src/settingsui/settingsuiapp.qrc +++ b/src/settingsui/settingsuiapp.qrc @@ -31,6 +31,6 @@ <file>settingsuiplugin/ShutdownPopup.qml</file> <file>bluetooth/Bluetooth.qml</file> <file>bluetooth/Discovery.qml</file> - <file>timedate/TimeDate.qml</file> + <file>ViewSettings.qml</file> </qresource> </RCC> |