diff options
| author | Sami Nurmenniemi <sami.nurmenniemi@qt.io> | 2017-10-04 16:49:44 +0300 |
|---|---|---|
| committer | Sami Nurmenniemi <sami.nurmenniemi@qt.io> | 2017-11-22 10:41:38 +0000 |
| commit | ddb14d59252c451a3ceb6271d9579c902cf6bdd2 (patch) | |
| tree | 817b1f05ff994cbb63fa113bce640a62eddeeb66 | |
| parent | 476128a09e78dee0c0afa9bfcfda8a88b6706c5b (diff) | |
Disable usage of LocaleManager.locale
It uses dbus for querying from a service that might not exist. If that
is the case, ui hangs for 20s. See QTBUG-63598.
Task-number: QTBUG-63091
Change-Id: I4b8a8355d7e4fcbd943e87277ffea412510f3926
Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io>
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
| -rw-r--r-- | src/settingsui/locale/Language.qml | 3 | ||||
| -rw-r--r-- | src/settingsui/locale/RegionSelect.qml | 11 | ||||
| -rw-r--r-- | src/settingsui/timedate/TimeDate.qml | 4 |
3 files changed, 6 insertions, 12 deletions
diff --git a/src/settingsui/locale/Language.qml b/src/settingsui/locale/Language.qml index 55a6627..43d4d39 100644 --- a/src/settingsui/locale/Language.qml +++ b/src/settingsui/locale/Language.qml @@ -35,7 +35,8 @@ import QtDeviceUtilities.QtButtonImageProvider 1.0 Item { id: root - property var currentRegion: Qt.locale(LocaleManager.locale) + // QTBUG-63598: property var currentRegion: Qt.locale(LocaleManager.locale) + property var currentRegion: Qt.locale("en_EN") Column { spacing: pluginMain.spacing diff --git a/src/settingsui/locale/RegionSelect.qml b/src/settingsui/locale/RegionSelect.qml index 0423a45..128ff55 100644 --- a/src/settingsui/locale/RegionSelect.qml +++ b/src/settingsui/locale/RegionSelect.qml @@ -36,7 +36,8 @@ import QtDeviceUtilities.QtButtonImageProvider 1.0 Item { id: root - property var currentRegion: Qt.locale(LocaleManager.locale) + // QTBUG-63598: property var currentRegion: Qt.locale(LocaleManager.locale) + property var currentRegion: Qt.locale("en_EN") Row { id: backRow @@ -132,14 +133,6 @@ Item { border.width: 2 } } - - QtButton { - id: searchButton - Layout.fillHeight: true - Layout.preferredWidth: root.width * 0.1 - fillColor: "#41cd52" - borderColor: "transparent" - } } CustomTableView { diff --git a/src/settingsui/timedate/TimeDate.qml b/src/settingsui/timedate/TimeDate.qml index 9110d80..f760ec2 100644 --- a/src/settingsui/timedate/TimeDate.qml +++ b/src/settingsui/timedate/TimeDate.qml @@ -63,7 +63,8 @@ Item { triggeredOnStart: true onTriggered: { var date = new Date(); - dateText.text = date.toLocaleString(Qt.locale(LocaleManager.locale), Locale.LongFormat) + // QTBUG-63598: dateText.text = date.toLocaleString(Qt.locale(LocaleManager.locale), Locale.LongFormat) + dateText.text = date.toLocaleString(Qt.locale("en_EN"), Locale.LongFormat) } } } @@ -101,7 +102,6 @@ Item { // Select timezone Text { - id: timeZoneText color: "white" text: qsTr("Time Zone") font.pixelSize: pluginMain.subTitleFontSize |