diff options
| author | Kimmo Ollila <kimmo.ollila@theqtcompany.com> | 2016-05-11 12:52:49 +0300 |
|---|---|---|
| committer | Kimmo Ollila <kimmo.ollila@theqtcompany.com> | 2016-05-13 13:11:35 +0000 |
| commit | 15ac9af2680d63321403f49eca03cdb192851bd3 (patch) | |
| tree | dcc08c12c6c6ac8bc6a5cb67e45016df349a5ac5 /src/settingsui/timedate | |
| parent | 046ad79065faff555168bae13e3414b23b0521a8 (diff) | |
Separated SettingsUI to its own plugin.
Change-Id: I7893231ab2d18270183f9838456d0e48cdc63186
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
Diffstat (limited to 'src/settingsui/timedate')
| -rw-r--r-- | src/settingsui/timedate/AnalogClock.qml | 4 | ||||
| -rw-r--r-- | src/settingsui/timedate/CustomCalendar.qml | 8 | ||||
| -rw-r--r-- | src/settingsui/timedate/TimeDate.qml | 4 | ||||
| -rw-r--r-- | src/settingsui/timedate/TimezonesView.qml | 5 |
4 files changed, 6 insertions, 15 deletions
diff --git a/src/settingsui/timedate/AnalogClock.qml b/src/settingsui/timedate/AnalogClock.qml index ff43347..b57ac7f 100644 --- a/src/settingsui/timedate/AnalogClock.qml +++ b/src/settingsui/timedate/AnalogClock.qml @@ -34,9 +34,7 @@ ** ****************************************************************************/ import QtQuick 2.6 -import Qt.labs.controls 1.0 -import Qt.labs.controls.material 1.0 -import Qt.labs.controls.universal 1.0 +import QtQuick.Controls 2.0 import com.theqtcompany.settings.timedate 1.0 Item { diff --git a/src/settingsui/timedate/CustomCalendar.qml b/src/settingsui/timedate/CustomCalendar.qml index 09d4e3e..b720a44 100644 --- a/src/settingsui/timedate/CustomCalendar.qml +++ b/src/settingsui/timedate/CustomCalendar.qml @@ -35,9 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 import QtQuick.Layouts 1.3 -import Qt.labs.controls 1.0 -import Qt.labs.controls.material 1.0 -import Qt.labs.controls.universal 1.0 +import QtQuick.Controls 2.0 import Qt.labs.calendar 1.0 import QtQml 2.2 import com.theqtcompany.settings.timedate 1.0 @@ -70,7 +68,7 @@ Rectangle { id: previousMonth Layout.preferredWidth: height visible: enabled - label: Rectangle { + contentItem: Rectangle { anchors.fill: parent color: "#d6d6d6" @@ -105,7 +103,7 @@ Rectangle { id: nextMonth Layout.preferredWidth: height visible: enabled - label: Rectangle { + contentItem: Rectangle { anchors.fill: parent color: "#d6d6d6" diff --git a/src/settingsui/timedate/TimeDate.qml b/src/settingsui/timedate/TimeDate.qml index cc46b78..2426f4a 100644 --- a/src/settingsui/timedate/TimeDate.qml +++ b/src/settingsui/timedate/TimeDate.qml @@ -35,9 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 import QtQuick.Layouts 1.3 -import Qt.labs.controls 1.0 -import Qt.labs.controls.material 1.0 -import Qt.labs.controls.universal 1.0 +import QtQuick.Controls 2.0 import com.theqtcompany.settings.timedate 1.0 Item { diff --git a/src/settingsui/timedate/TimezonesView.qml b/src/settingsui/timedate/TimezonesView.qml index 16ac10e..5d81121 100644 --- a/src/settingsui/timedate/TimezonesView.qml +++ b/src/settingsui/timedate/TimezonesView.qml @@ -35,12 +35,9 @@ ****************************************************************************/ import QtQuick 2.6 import QtQuick.Layouts 1.3 -import Qt.labs.controls 1.0 -import Qt.labs.controls.material 1.0 -import Qt.labs.controls.universal 1.0 +import QtQuick.Controls 2.0 import com.theqtcompany.settings.timedate 1.0 import "../common" - Item { id: root property string title: qsTr("Timezone settings") |