summaryrefslogtreecommitdiffstats
path: root/src/settingsui/timedate
diff options
context:
space:
mode:
Diffstat (limited to 'src/settingsui/timedate')
-rw-r--r--src/settingsui/timedate/AnalogClock.qml4
-rw-r--r--src/settingsui/timedate/CustomCalendar.qml8
-rw-r--r--src/settingsui/timedate/TimeDate.qml4
-rw-r--r--src/settingsui/timedate/TimezonesView.qml5
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")