diff options
author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2023-02-09 13:50:45 +0100 |
---|---|---|
committer | SanthoshKumar Selvaraj <santhosh.kumar.selvaraj@qt.io> | 2023-02-13 12:52:54 +0100 |
commit | c0918d63065662d3e42049892c565a9a4c2007f5 (patch) | |
tree | 5b6b76e26457aedc9525345e1031b6e46d7529d2 | |
parent | 8c19ce8308f28af993e221014cb44c92bcfe7b15 (diff) |
Adapt to Qt::Appearance to Qt::ColorScheme rename
Pick-to: 6.5
Change-Id: I5830af713e024fa9a7086e8c56e6808ff8593394
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
37 files changed, 105 insertions, 105 deletions
diff --git a/examples/quickcontrols/ios/todolist/HomePage.qml b/examples/quickcontrols/ios/todolist/HomePage.qml index 94221146e2..50ec2a37ee 100644 --- a/examples/quickcontrols/ios/todolist/HomePage.qml +++ b/examples/quickcontrols/ios/todolist/HomePage.qml @@ -56,7 +56,7 @@ Page { } Image { - source: Qt.styleHints.appearance === Qt.Dark ? "images/close-white.png" + source: Qt.styleHints.colorScheme === Qt.Dark ? "images/close-white.png" : "images/close.png" width: 20 height: 20 diff --git a/examples/quickcontrols/ios/todolist/ProjectPage.qml b/examples/quickcontrols/ios/todolist/ProjectPage.qml index a38ad04554..3afd68fd85 100644 --- a/examples/quickcontrols/ios/todolist/ProjectPage.qml +++ b/examples/quickcontrols/ios/todolist/ProjectPage.qml @@ -159,7 +159,7 @@ Page { anchors.leftMargin: 10 anchors.verticalCenter: parent.verticalCenter icon.source: "images/close.png" - icon.color: Qt.styleHints.appearance === Qt.Dark ? "white" : "black" + icon.color: Qt.styleHints.colorScheme === Qt.Dark ? "white" : "black" onClicked: { Database.deleteTask(taskList.taskId) diff --git a/examples/quickcontrols/ios/todolist/SettingsPage.qml b/examples/quickcontrols/ios/todolist/SettingsPage.qml index 4d2d7bef9f..65514cf370 100644 --- a/examples/quickcontrols/ios/todolist/SettingsPage.qml +++ b/examples/quickcontrols/ios/todolist/SettingsPage.qml @@ -52,7 +52,7 @@ Page { required property string page Image { - source: Qt.styleHints.appearance === Qt.Dark ? "images/back-white.png" + source: Qt.styleHints.colorScheme === Qt.Dark ? "images/back-white.png" : "images/back.png" width: 20 height: 20 diff --git a/src/quickcontrols/ios/BusyIndicator.qml b/src/quickcontrols/ios/BusyIndicator.qml index e9c874d904..7a2241ca4c 100644 --- a/src/quickcontrols/ios/BusyIndicator.qml +++ b/src/quickcontrols/ios/BusyIndicator.qml @@ -27,7 +27,7 @@ T.BusyIndicator { contentItem: Image { property int currentImage: 8 source: IOS.url + "busyindicator-frame-0" + currentImage + - (Qt.styleHints.appearance === Qt.Light ? "-light.png" : "-dark.png") + (Qt.styleHints.colorScheme === Qt.Light ? "-light.png" : "-dark.png") fillMode: Image.PreserveAspectFit NumberAnimation on currentImage { running: control.running diff --git a/src/quickcontrols/ios/CheckBox.qml b/src/quickcontrols/ios/CheckBox.qml index 2ef8f83114..1a72cd76f3 100644 --- a/src/quickcontrols/ios/CheckBox.qml +++ b/src/quickcontrols/ios/CheckBox.qml @@ -27,8 +27,8 @@ T.CheckBox { states: [ {"checked": control.checkState === Qt.Checked}, {"partially-checked": control.checkState === Qt.PartiallyChecked}, - {"light": Qt.styleHints.appearance === Qt.Light}, - {"dark": Qt.styleHints.appearance === Qt.Dark} + {"light": Qt.styleHints.colorScheme === Qt.Light}, + {"dark": Qt.styleHints.colorScheme === Qt.Dark} ] } } diff --git a/src/quickcontrols/ios/CheckDelegate.qml b/src/quickcontrols/ios/CheckDelegate.qml index fbd2a4ce35..654eb5ffb3 100644 --- a/src/quickcontrols/ios/CheckDelegate.qml +++ b/src/quickcontrols/ios/CheckDelegate.qml @@ -32,8 +32,8 @@ T.CheckDelegate { states: [ {"checked": control.checkState === Qt.Checked}, {"partially-checked": control.checkState === Qt.PartiallyChecked}, - {"light": Qt.styleHints.appearance === Qt.Light}, - {"dark": Qt.styleHints.appearance === Qt.Dark} + {"light": Qt.styleHints.colorScheme === Qt.Light}, + {"dark": Qt.styleHints.colorScheme === Qt.Dark} ] } } @@ -55,7 +55,7 @@ T.CheckDelegate { background: Rectangle { implicitHeight: 44 - color: Qt.styleHints.appearance === Qt.Dark ? control.palette.light : control.palette.base + color: Qt.styleHints.colorScheme === Qt.Dark ? control.palette.light : control.palette.base NinePatchImage { property real offset: control.icon.source.toString() !== "" ? control.icon.width + control.spacing : 0 x: control.down ? 0 : control.leftPadding + offset @@ -65,8 +65,8 @@ T.CheckDelegate { source: IOS.url + "itemdelegate-background" NinePatchImageSelector on source { states: [ - {"light": Qt.styleHints.appearance === Qt.Light}, - {"dark": Qt.styleHints.appearance === Qt.Dark}, + {"light": Qt.styleHints.colorScheme === Qt.Light}, + {"dark": Qt.styleHints.colorScheme === Qt.Dark}, {"pressed": control.down} ] } diff --git a/src/quickcontrols/ios/ComboBox.qml b/src/quickcontrols/ios/ComboBox.qml index 491325258d..a166ea5ca2 100644 --- a/src/quickcontrols/ios/ComboBox.qml +++ b/src/quickcontrols/ios/ComboBox.qml @@ -49,8 +49,8 @@ T.ComboBox { states: [ {"edge": isFirstItem || isLastItem }, {"single": isSingleItem}, - {"light": Qt.styleHints.appearance === Qt.Light}, - {"dark": Qt.styleHints.appearance === Qt.Dark}, + {"light": Qt.styleHints.colorScheme === Qt.Light}, + {"dark": Qt.styleHints.colorScheme === Qt.Dark}, {"pressed": down} ] } @@ -70,8 +70,8 @@ T.ComboBox { : defaultColor ImageSelector on source { states: [ - {"light": Qt.styleHints.appearance === Qt.Light}, - {"dark": Qt.styleHints.appearance === Qt.Dark}, + {"light": Qt.styleHints.colorScheme === Qt.Light}, + {"dark": Qt.styleHints.colorScheme === Qt.Dark}, {"pressed": control.down} ] } diff --git a/src/quickcontrols/ios/Dial.qml b/src/quickcontrols/ios/Dial.qml index 2a4c9666bc..fe21fdccc4 100644 --- a/src/quickcontrols/ios/Dial.qml +++ b/src/quickcontrols/ios/Dial.qml @@ -92,8 +92,8 @@ T.Dial { source: IOS.url + "slider-handle" NinePatchImageSelector on source { states: [ - {"light": Qt.styleHints.appearance === Qt.Light}, - {"dark": Qt.styleHints.appearance === Qt.Dark}, + {"light": Qt.styleHints.colorScheme === Qt.Light}, + {"dark": Qt.styleHints.colorScheme === Qt.Dark}, {"disabled": !control.enabled} ] } diff --git a/src/quickcontrols/ios/Drawer.qml b/src/quickcontrols/ios/Drawer.qml index 52cdb8b372..2ee955e7bc 100644 --- a/src/quickcontrols/ios/Drawer.qml +++ b/src/quickcontrols/ios/Drawer.qml @@ -32,8 +32,8 @@ T.Drawer { source: IOS.url + "drawer-background" NinePatchImageSelector on source { states: [ - {"light": Qt.styleHints.appearance === Qt.Light}, - {"dark": Qt.styleHints.appearance === Qt.Dark}, + {"light": Qt.styleHints.colorScheme === Qt.Light}, + {"dark": Qt.styleHints.colorScheme === Qt.Dark}, {"modal": control.modal} ] } diff --git a/src/quickcontrols/ios/Frame.qml b/src/quickcontrols/ios/Frame.qml index 5c52269a3c..9179366808 100644 --- a/src/quickcontrols/ios/Frame.qml +++ b/src/quickcontrols/ios/Frame.qml @@ -19,6 +19,6 @@ T.Frame { background: Rectangle { radius: 9 - color: Qt.styleHints.appearance === Qt.Dark ? control.palette.light : control.palette.base + color: Qt.styleHints.colorScheme === Qt.Dark ? control.palette.light : control.palette.base } } diff --git a/src/quickcontrols/ios/GroupBox.qml b/src/quickcontrols/ios/GroupBox.qml index 3adc599ddf..d3d14e7df8 100644 --- a/src/quickcontrols/ios/GroupBox.qml +++ b/src/quickcontrols/ios/GroupBox.qml @@ -36,6 +36,6 @@ T.GroupBox { width: parent.width height: parent.height - control.topPadding + control.bottomPadding radius: 9 - color: Qt.styleHints.appearance === Qt.Dark ? control.palette.light : control.palette.base + color: Qt.styleHints.colorScheme === Qt.Dark ? control.palette.light : control.palette.base } } diff --git a/src/quickcontrols/ios/ItemDelegate.qml b/src/quickcontrols/ios/ItemDelegate.qml index 28146e51fd..9e6358a651 100644 --- a/src/quickcontrols/ios/ItemDelegate.qml +++ b/src/quickcontrols/ios/ItemDelegate.qml @@ -36,7 +36,7 @@ T.ItemDelegate { background: Rectangle { implicitHeight: 44 - color: Qt.styleHints.appearance === Qt.Dark ? control.palette.light : control.palette.base + color: Qt.styleHints.colorScheme === Qt.Dark ? control.palette.light : control.palette.base NinePatchImage { property real offset: control.icon.source.toString() !== "" ? control.icon.width + control.spacing : 0 x: control.down ? 0 : control.leftPadding + offset @@ -46,8 +46,8 @@ T.ItemDelegate { source: IOS.url + "itemdelegate-background" NinePatchImageSelector on source { states: [ - {"light": Qt.styleHints.appearance === Qt.Light}, - {"dark": Qt.styleHints.appearance === Qt.Dark}, + {"light": Qt.styleHints.colorScheme === Qt.Light}, + {"dark": Qt.styleHints.colorScheme === Qt.Dark}, {"pressed": control.down} ] } diff --git a/src/quickcontrols/ios/Menu.qml b/src/quickcontrols/ios/Menu.qml index 437731c19e..c968561caf 100644 --- a/src/quickcontrols/ios/Menu.qml +++ b/src/quickcontrols/ios/Menu.qml @@ -52,8 +52,8 @@ T.Menu { source: IOS.url + "menu-background" NinePatchImageSelector on source { states: [ - {"light": Qt.styleHints.appearance === Qt.Light}, - {"dark": Qt.styleHints.appearance === Qt.Dark} + {"light": Qt.styleHints.colorScheme === Qt.Light}, + {"dark": Qt.styleHints.colorScheme === Qt.Dark} ] } } diff --git a/src/quickcontrols/ios/MenuBar.qml b/src/quickcontrols/ios/MenuBar.qml index 06f549e82a..b38fa12fcb 100644 --- a/src/quickcontrols/ios/MenuBar.qml +++ b/src/quickcontrols/ios/MenuBar.qml @@ -24,7 +24,7 @@ T.MenuBar { background: Rectangle { opacity: 0.98 - color: Qt.styleHints.appearance === Qt.Dark ? control.palette.light : control.palette.base + color: Qt.styleHints.colorScheme === Qt.Dark ? control.palette.light : control.palette.base Rectangle { height: 1 width: parent.width diff --git a/src/quickcontrols/ios/MenuItem.qml b/src/quickcontrols/ios/MenuItem.qml index 91fa865e06..8cc84c5755 100644 --- a/src/quickcontrols/ios/MenuItem.qml +++ b/src/quickcontrols/ios/MenuItem.qml @@ -86,8 +86,8 @@ T.MenuItem { states: [ {"edge": control.isFirstItem || control.isLastItem}, {"single": control.isSingleItem}, - {"light": Qt.styleHints.appearance === Qt.Light}, - {"dark": Qt.styleHints.appearance === Qt.Dark}, + {"light": Qt.styleHints.colorScheme === Qt.Light}, + {"dark": Qt.styleHints.colorScheme === Qt.Dark}, {"pressed": control.down} ] } diff --git a/src/quickcontrols/ios/MenuSeparator.qml b/src/quickcontrols/ios/MenuSeparator.qml index ba69005611..790d8f0302 100644 --- a/src/quickcontrols/ios/MenuSeparator.qml +++ b/src/quickcontrols/ios/MenuSeparator.qml @@ -18,8 +18,8 @@ T.MenuSeparator { source: IOS.url + "menuseparator-separator" NinePatchImageSelector on source { states: [ - {"light": Qt.styleHints.appearance === Qt.Light}, - {"dark": Qt.styleHints.appearance === Qt.Dark} + {"light": Qt.styleHints.colorScheme === Qt.Light}, + {"dark": Qt.styleHints.colorScheme === Qt.Dark} ] } } diff --git a/src/quickcontrols/ios/PageIndicator.qml b/src/quickcontrols/ios/PageIndicator.qml index 036f952ea8..9a059b5df2 100644 --- a/src/quickcontrols/ios/PageIndicator.qml +++ b/src/quickcontrols/ios/PageIndicator.qml @@ -18,8 +18,8 @@ T.PageIndicator { source: IOS.url + "pageindicator-delegate" ImageSelector on source { states: [ - {"light": Qt.styleHints.appearance === Qt.Light}, - {"dark": Qt.styleHints.appearance === Qt.Dark}, + {"light": Qt.styleHints.colorScheme === Qt.Light}, + {"dark": Qt.styleHints.colorScheme === Qt.Dark}, {"current": index === control.currentIndex}, ] } diff --git a/src/quickcontrols/ios/Popup.qml b/src/quickcontrols/ios/Popup.qml index 47a6157f71..ec76a90267 100644 --- a/src/quickcontrols/ios/Popup.qml +++ b/src/quickcontrols/ios/Popup.qml @@ -35,8 +35,8 @@ T.Popup { source: IOS.url + "popup-background" NinePatchImageSelector on source { states: [ - {"light": Qt.styleHints.appearance === Qt.Light}, - {"dark": Qt.styleHints.appearance === Qt.Dark} + {"light": Qt.styleHints.colorScheme === Qt.Light}, + {"dark": Qt.styleHints.colorScheme === Qt.Dark} ] } } diff --git a/src/quickcontrols/ios/ProgressBar.qml b/src/quickcontrols/ios/ProgressBar.qml index c280d5f94f..66544c89ee 100644 --- a/src/quickcontrols/ios/ProgressBar.qml +++ b/src/quickcontrols/ios/ProgressBar.qml @@ -31,8 +31,8 @@ T.ProgressBar { source: IOS.url + "slider-progress" NinePatchImageSelector on source { states: [ - {"light": Qt.styleHints.appearance === Qt.Light}, - {"dark": Qt.styleHints.appearance === Qt.Dark} + {"light": Qt.styleHints.colorScheme === Qt.Light}, + {"dark": Qt.styleHints.colorScheme === Qt.Dark} ] } @@ -57,8 +57,8 @@ T.ProgressBar { width: control.background.width NinePatchImageSelector on source { states: [ - {"light": Qt.styleHints.appearance === Qt.Light}, - {"dark": Qt.styleHints.appearance === Qt.Dark} + {"light": Qt.styleHints.colorScheme === Qt.Light}, + {"dark": Qt.styleHints.colorScheme === Qt.Dark} ] } } diff --git a/src/quickcontrols/ios/RadioButton.qml b/src/quickcontrols/ios/RadioButton.qml index 37cf71e1f5..417dff3717 100644 --- a/src/quickcontrols/ios/RadioButton.qml +++ b/src/quickcontrols/ios/RadioButton.qml @@ -26,8 +26,8 @@ T.RadioButton { ImageSelector on source { states: [ {"checked": control.checked}, - {"light": Qt.styleHints.appearance === Qt.Light}, - {"dark": Qt.styleHints.appearance === Qt.Dark} + {"light": Qt.styleHints.colorScheme === Qt.Light}, + {"dark": Qt.styleHints.colorScheme === Qt.Dark} ] } } diff --git a/src/quickcontrols/ios/RadioDelegate.qml b/src/quickcontrols/ios/RadioDelegate.qml index 6de6dbb622..d4eb4617f1 100644 --- a/src/quickcontrols/ios/RadioDelegate.qml +++ b/src/quickcontrols/ios/RadioDelegate.qml @@ -32,8 +32,8 @@ T.RadioDelegate { source: IOS.url + "radiodelegate-indicator" ImageSelector on source { states: [ - {"light": Qt.styleHints.appearance === Qt.Light}, - {"dark": Qt.styleHints.appearance === Qt.Dark} + {"light": Qt.styleHints.colorScheme === Qt.Light}, + {"dark": Qt.styleHints.colorScheme === Qt.Dark} ] } } @@ -55,7 +55,7 @@ T.RadioDelegate { background: Rectangle { implicitHeight: 44 - color: Qt.styleHints.appearance === Qt.Dark ? control.palette.light : control.palette.base + color: Qt.styleHints.colorScheme === Qt.Dark ? control.palette.light : control.palette.base NinePatchImage { property real offset: control.icon.source.toString() !== "" ? control.icon.width + control.spacing : 0 x: control.down ? 0 : control.leftPadding + offset @@ -65,8 +65,8 @@ T.RadioDelegate { source: IOS.url + "itemdelegate-background" NinePatchImageSelector on source { states: [ - {"light": Qt.styleHints.appearance === Qt.Light}, - {"dark": Qt.styleHints.appearance === Qt.Dark}, + {"light": Qt.styleHints.colorScheme === Qt.Light}, + {"dark": Qt.styleHints.colorScheme === Qt.Dark}, {"pressed": control.down} ] } diff --git a/src/quickcontrols/ios/RangeSlider.qml b/src/quickcontrols/ios/RangeSlider.qml index 966f612ba8..a8bca2eee9 100644 --- a/src/quickcontrols/ios/RangeSlider.qml +++ b/src/quickcontrols/ios/RangeSlider.qml @@ -28,8 +28,8 @@ T.RangeSlider { source: IOS.url + "slider-handle" NinePatchImageSelector on source { states: [ - {"light": Qt.styleHints.appearance === Qt.Light}, - {"dark": Qt.styleHints.appearance === Qt.Dark}, + {"light": Qt.styleHints.colorScheme === Qt.Light}, + {"dark": Qt.styleHints.colorScheme === Qt.Dark}, ] } } @@ -47,8 +47,8 @@ T.RangeSlider { source: IOS.url + "slider-handle" NinePatchImageSelector on source { states: [ - {"light": Qt.styleHints.appearance === Qt.Light}, - {"dark": Qt.styleHints.appearance === Qt.Dark}, + {"light": Qt.styleHints.colorScheme === Qt.Light}, + {"dark": Qt.styleHints.colorScheme === Qt.Dark}, ] } } @@ -67,8 +67,8 @@ T.RangeSlider { width: control.horizontal ? control.background.width : control.background.height NinePatchImageSelector on source { states: [ - {"light": Qt.styleHints.appearance === Qt.Light}, - {"dark": Qt.styleHints.appearance === Qt.Dark}, + {"light": Qt.styleHints.colorScheme === Qt.Light}, + {"dark": Qt.styleHints.colorScheme === Qt.Dark}, ] } @@ -81,8 +81,8 @@ T.RangeSlider { source: IOS.url + "slider-progress" NinePatchImageSelector on source { states: [ - {"light": Qt.styleHints.appearance === Qt.Light}, - {"dark": Qt.styleHints.appearance === Qt.Dark}, + {"light": Qt.styleHints.colorScheme === Qt.Light}, + {"dark": Qt.styleHints.colorScheme === Qt.Dark}, ] } } diff --git a/src/quickcontrols/ios/ScrollBar.qml b/src/quickcontrols/ios/ScrollBar.qml index 3bdabe4f08..afd2e737b3 100644 --- a/src/quickcontrols/ios/ScrollBar.qml +++ b/src/quickcontrols/ios/ScrollBar.qml @@ -24,8 +24,8 @@ T.ScrollBar { source: IOS.url + "scrollindicator-handle" NinePatchImageSelector on source { states: [ - {"light": Qt.styleHints.appearance === Qt.Light}, - {"dark": Qt.styleHints.appearance === Qt.Dark}, + {"light": Qt.styleHints.colorScheme === Qt.Light}, + {"dark": Qt.styleHints.colorScheme === Qt.Dark}, {"horizontal": control.horizontal}, {"vertical": control.vertical} ] diff --git a/src/quickcontrols/ios/ScrollIndicator.qml b/src/quickcontrols/ios/ScrollIndicator.qml index d6d842196a..5af880ca36 100644 --- a/src/quickcontrols/ios/ScrollIndicator.qml +++ b/src/quickcontrols/ios/ScrollIndicator.qml @@ -18,8 +18,8 @@ T.ScrollIndicator { source: IOS.url + "scrollindicator-handle" NinePatchImageSelector on source { states: [ - {"light": Qt.styleHints.appearance === Qt.Light}, - {"dark": Qt.styleHints.appearance === Qt.Dark}, + {"light": Qt.styleHints.colorScheme === Qt.Light}, + {"dark": Qt.styleHints.colorScheme === Qt.Dark}, {"horizontal": control.horizontal}, {"vertical": control.vertical} ] diff --git a/src/quickcontrols/ios/Slider.qml b/src/quickcontrols/ios/Slider.qml index 1f6ca9f242..fe76303e26 100644 --- a/src/quickcontrols/ios/Slider.qml +++ b/src/quickcontrols/ios/Slider.qml @@ -26,8 +26,8 @@ T.Slider { source: IOS.url + "slider-handle" NinePatchImageSelector on source { states: [ - {"light": Qt.styleHints.appearance === Qt.Light}, - {"dark": Qt.styleHints.appearance === Qt.Dark}, + {"light": Qt.styleHints.colorScheme === Qt.Light}, + {"dark": Qt.styleHints.colorScheme === Qt.Dark}, {"disabled": !control.enabled} ] } @@ -47,8 +47,8 @@ T.Slider { width: control.horizontal ? background.width : background.height NinePatchImageSelector on source { states: [ - {"light": Qt.styleHints.appearance === Qt.Light}, - {"dark": Qt.styleHints.appearance === Qt.Dark}, + {"light": Qt.styleHints.colorScheme === Qt.Light}, + {"dark": Qt.styleHints.colorScheme === Qt.Dark}, ] } @@ -59,8 +59,8 @@ T.Slider { source: IOS.url + "slider-progress" NinePatchImageSelector on source { states: [ - {"light": Qt.styleHints.appearance === Qt.Light}, - {"dark": Qt.styleHints.appearance === Qt.Dark}, + {"light": Qt.styleHints.colorScheme === Qt.Light}, + {"dark": Qt.styleHints.colorScheme === Qt.Dark}, ] } } diff --git a/src/quickcontrols/ios/SpinBox.qml b/src/quickcontrols/ios/SpinBox.qml index 11131a0db1..4168f6b43e 100644 --- a/src/quickcontrols/ios/SpinBox.qml +++ b/src/quickcontrols/ios/SpinBox.qml @@ -53,8 +53,8 @@ T.SpinBox { states: [ {"up": true}, {"pressed": control.up.pressed}, - {"light": Qt.styleHints.appearance === Qt.Light}, - {"dark": Qt.styleHints.appearance === Qt.Dark} + {"light": Qt.styleHints.colorScheme === Qt.Light}, + {"dark": Qt.styleHints.colorScheme === Qt.Dark} ] } } @@ -69,8 +69,8 @@ T.SpinBox { states: [ {"down": true}, {"pressed": control.down.pressed}, - {"light": Qt.styleHints.appearance === Qt.Light}, - {"dark": Qt.styleHints.appearance === Qt.Dark} + {"light": Qt.styleHints.colorScheme === Qt.Light}, + {"dark": Qt.styleHints.colorScheme === Qt.Dark} ] } } @@ -87,8 +87,8 @@ T.SpinBox { y: (parent.height - height) / 2 NinePatchImageSelector on source { states: [ - {"light": Qt.styleHints.appearance === Qt.Light}, - {"dark": Qt.styleHints.appearance === Qt.Dark} + {"light": Qt.styleHints.colorScheme === Qt.Light}, + {"dark": Qt.styleHints.colorScheme === Qt.Dark} ] } } diff --git a/src/quickcontrols/ios/SwipeDelegate.qml b/src/quickcontrols/ios/SwipeDelegate.qml index ccabfc0cb4..1d78f6ed3a 100644 --- a/src/quickcontrols/ios/SwipeDelegate.qml +++ b/src/quickcontrols/ios/SwipeDelegate.qml @@ -39,7 +39,7 @@ T.SwipeDelegate { background: Rectangle { implicitHeight: 44 - color: Qt.styleHints.appearance === Qt.Dark ? control.palette.light : control.palette.base + color: Qt.styleHints.colorScheme === Qt.Dark ? control.palette.light : control.palette.base NinePatchImage { property real offset: control.icon.source.toString() !== "" ? control.icon.width + control.spacing : 0 x: control.down ? 0 : control.leftPadding + offset @@ -49,8 +49,8 @@ T.SwipeDelegate { source: IOS.url + "itemdelegate-background" NinePatchImageSelector on source { states: [ - {"light": Qt.styleHints.appearance === Qt.Light}, - {"dark": Qt.styleHints.appearance === Qt.Dark}, + {"light": Qt.styleHints.colorScheme === Qt.Light}, + {"dark": Qt.styleHints.colorScheme === Qt.Dark}, {"pressed": control.down} ] } diff --git a/src/quickcontrols/ios/Switch.qml b/src/quickcontrols/ios/Switch.qml index 7a600afc5f..caf0a35d12 100644 --- a/src/quickcontrols/ios/Switch.qml +++ b/src/quickcontrols/ios/Switch.qml @@ -32,8 +32,8 @@ T.Switch { source: IOS.url + "switch-indicator" ImageSelector on source { states: [ - {"light": Qt.styleHints.appearance === Qt.Light}, - {"dark": Qt.styleHints.appearance === Qt.Dark}, + {"light": Qt.styleHints.colorScheme === Qt.Light}, + {"dark": Qt.styleHints.colorScheme === Qt.Dark}, {"checked": control.checked} ] } @@ -53,8 +53,8 @@ T.Switch { source: IOS.url + "switch-handle" NinePatchImageSelector on source { states: [ - {"light": Qt.styleHints.appearance === Qt.Light}, - {"dark": Qt.styleHints.appearance === Qt.Dark}, + {"light": Qt.styleHints.colorScheme === Qt.Light}, + {"dark": Qt.styleHints.colorScheme === Qt.Dark}, {"disabled": !control.enabled} ] } diff --git a/src/quickcontrols/ios/SwitchDelegate.qml b/src/quickcontrols/ios/SwitchDelegate.qml index 4cba6dcabf..3da4411823 100644 --- a/src/quickcontrols/ios/SwitchDelegate.qml +++ b/src/quickcontrols/ios/SwitchDelegate.qml @@ -33,8 +33,8 @@ T.SwitchDelegate { source: IOS.url + "switch-indicator" ImageSelector on source { states: [ - {"light": Qt.styleHints.appearance === Qt.Light}, - {"dark": Qt.styleHints.appearance === Qt.Dark}, + {"light": Qt.styleHints.colorScheme === Qt.Light}, + {"dark": Qt.styleHints.colorScheme === Qt.Dark}, {"checked": control.checked} ] } @@ -54,8 +54,8 @@ T.SwitchDelegate { source: IOS.url + "switch-handle" NinePatchImageSelector on source { states: [ - {"light": Qt.styleHints.appearance === Qt.Light}, - {"dark": Qt.styleHints.appearance === Qt.Dark}, + {"light": Qt.styleHints.colorScheme === Qt.Light}, + {"dark": Qt.styleHints.colorScheme === Qt.Dark}, {"disabled": !control.enabled} ] } @@ -84,7 +84,7 @@ T.SwitchDelegate { background: Rectangle { implicitHeight: 44 - color: Qt.styleHints.appearance === Qt.Dark ? control.palette.light : control.palette.base + color: Qt.styleHints.colorScheme === Qt.Dark ? control.palette.light : control.palette.base NinePatchImage { property real offset: control.icon.source.toString() !== "" ? control.icon.width + control.spacing : 0 x: control.leftPadding + offset @@ -93,8 +93,8 @@ T.SwitchDelegate { source: IOS.url + "itemdelegate-background" NinePatchImageSelector on source { states: [ - {"light": Qt.styleHints.appearance === Qt.Light}, - {"dark": Qt.styleHints.appearance === Qt.Dark}, + {"light": Qt.styleHints.colorScheme === Qt.Light}, + {"dark": Qt.styleHints.colorScheme === Qt.Dark}, ] } } diff --git a/src/quickcontrols/ios/TabBar.qml b/src/quickcontrols/ios/TabBar.qml index 1d289c71af..0f42ea14e5 100644 --- a/src/quickcontrols/ios/TabBar.qml +++ b/src/quickcontrols/ios/TabBar.qml @@ -32,7 +32,7 @@ T.TabBar { background: Rectangle { implicitHeight: 49 - color: Qt.styleHints.appearance === Qt.Dark ? control.palette.light : control.palette.base + color: Qt.styleHints.colorScheme === Qt.Dark ? control.palette.light : control.palette.base Rectangle { height: 1 width: parent.width diff --git a/src/quickcontrols/ios/ToolBar.qml b/src/quickcontrols/ios/ToolBar.qml index 77b3d8ac0b..28b0029018 100644 --- a/src/quickcontrols/ios/ToolBar.qml +++ b/src/quickcontrols/ios/ToolBar.qml @@ -15,7 +15,7 @@ T.ToolBar { background: Rectangle { implicitHeight: 49 - color: Qt.styleHints.appearance === Qt.Dark ? control.palette.light : control.palette.base + color: Qt.styleHints.colorScheme === Qt.Dark ? control.palette.light : control.palette.base Rectangle { height: 1 width: parent.width diff --git a/src/quickcontrols/ios/TreeViewDelegate.qml b/src/quickcontrols/ios/TreeViewDelegate.qml index 89577e297b..231eb45941 100644 --- a/src/quickcontrols/ios/TreeViewDelegate.qml +++ b/src/quickcontrols/ios/TreeViewDelegate.qml @@ -46,8 +46,8 @@ T.TreeViewDelegate { source: IOS.url + "arrow-indicator" ImageSelector on source { states: [ - {"light": Qt.styleHints.appearance === Qt.Light}, - {"dark": Qt.styleHints.appearance === Qt.Dark} + {"light": Qt.styleHints.colorScheme === Qt.Light}, + {"dark": Qt.styleHints.colorScheme === Qt.Dark} ] } } @@ -55,15 +55,15 @@ T.TreeViewDelegate { background: Rectangle { implicitHeight: 44 - color: Qt.styleHints.appearance === Qt.Dark ? control.palette.dark : control.palette.base + color: Qt.styleHints.colorScheme === Qt.Dark ? control.palette.dark : control.palette.base NinePatchImage { height: parent.height width: parent.width source: IOS.url + (control.highlighted ? "itemdelegate-background-pressed" : "itemdelegate-background") NinePatchImageSelector on source { states: [ - {"light": Qt.styleHints.appearance === Qt.Light}, - {"dark": Qt.styleHints.appearance === Qt.Dark} + {"light": Qt.styleHints.colorScheme === Qt.Light}, + {"dark": Qt.styleHints.colorScheme === Qt.Dark} ] } } diff --git a/src/quickcontrols/qquickstyle.cpp b/src/quickcontrols/qquickstyle.cpp index 8befd80ea4..6a31da0b88 100644 --- a/src/quickcontrols/qquickstyle.cpp +++ b/src/quickcontrols/qquickstyle.cpp @@ -386,7 +386,7 @@ bool QQuickStylePrivate::isDarkSystemTheme() { const bool dark = [](){ if (const QPlatformTheme *theme = QGuiApplicationPrivate::platformTheme()) - return theme->appearance() == Qt::Appearance::Dark; + return theme->colorScheme() == Qt::ColorScheme::Dark; return false; }(); return dark; diff --git a/src/quickcontrols/qquickstyleplugin.cpp b/src/quickcontrols/qquickstyleplugin.cpp index 8f0a71c9ad..5b2613eba7 100644 --- a/src/quickcontrols/qquickstyleplugin.cpp +++ b/src/quickcontrols/qquickstyleplugin.cpp @@ -62,7 +62,7 @@ void QQuickStylePlugin::registerTypes(const char *uri) qCDebug(lcStylePlugin) << "theme has not yet been initialized; calling initializeTheme()"; initializeTheme(theme); - connect(QGuiApplication::styleHints(), &QStyleHints::appearanceChanged, + connect(QGuiApplication::styleHints(), &QStyleHints::colorSchemeChanged, this, &QQuickStylePlugin::updateTheme); if (!styleName.isEmpty()) @@ -75,7 +75,7 @@ void QQuickStylePlugin::unregisterTypes() if (!QQuickThemePrivate::instance) return; - disconnect(QGuiApplication::styleHints(), &QStyleHints::appearanceChanged, + disconnect(QGuiApplication::styleHints(), &QStyleHints::colorSchemeChanged, this, &QQuickStylePlugin::updateTheme); // Not every style has a plugin - some styles are QML-only. So, we clean this diff --git a/src/quicknativestyle/qtquickcontrols2nativestyleplugin.cpp b/src/quicknativestyle/qtquickcontrols2nativestyleplugin.cpp index e0b0e77bf3..050438026b 100644 --- a/src/quicknativestyle/qtquickcontrols2nativestyleplugin.cpp +++ b/src/quicknativestyle/qtquickcontrols2nativestyleplugin.cpp @@ -111,7 +111,7 @@ void QtQuickControls2NativeStylePlugin::initializeEngine(QQmlEngine *engine, con style = new QMacStyle; #elif defined(Q_OS_WINDOWS) style = new QWindowsXPStyle; - if (QGuiApplication::styleHints()->appearance() == Qt::Appearance::Dark) + if (QGuiApplication::styleHints()->colorScheme() == Qt::ColorScheme::Dark) qobject_cast<QWindowsStyle *>(style)->refreshPalette(); #else style = new QCommonStyle; diff --git a/tests/baseline/controls/tst_baseline_controls.cpp b/tests/baseline/controls/tst_baseline_controls.cpp index 2b398edf3c..eb71f078cd 100644 --- a/tests/baseline/controls/tst_baseline_controls.cpp +++ b/tests/baseline/controls/tst_baseline_controls.cpp @@ -123,24 +123,24 @@ void tst_Baseline_Controls::initTestCase() // See also qwidgetbaselinetest.cpp QPalette palette; QFont font; - QByteArray appearanceBytes; + QByteArray colorSchemeBytes; { - QDataStream appearanceStream(&appearanceBytes, QIODevice::WriteOnly); - appearanceStream << palette << font; + QDataStream colorSchemeStream(&colorSchemeBytes, QIODevice::WriteOnly); + colorSchemeStream << palette << font; const qreal screenDpr = QGuiApplication::primaryScreen()->devicePixelRatio(); if (screenDpr != 1.0) { qWarning() << "DPR is" << screenDpr << "- images will not be compared to 1.0 baseline!"; - appearanceStream << screenDpr; + colorSchemeStream << screenDpr; } } - const quint16 appearanceId = qChecksum(appearanceBytes); + const quint16 colorSchemeId = qChecksum(colorSchemeBytes); const QColor windowColor = palette.window().color(); const QColor textColor = palette.text().color(); - const QString appearanceIdString = (windowColor.value() > textColor.value() + const QString colorSchemeIdStr = (windowColor.value() > textColor.value() ? QString("light-%1") : QString("dark-%1")) - .arg(appearanceId, 0, 16); - QBaselineTest::addClientProperty("AppearanceID", appearanceIdString); + .arg(colorSchemeId, 0, 16); + QBaselineTest::addClientProperty("AppearanceID", colorSchemeIdStr); QByteArray msg; if (!QBaselineTest::connectToBaselineServer(&msg)) @@ -148,7 +148,7 @@ void tst_Baseline_Controls::initTestCase() // let users know where they can find the results qInfo("PlatformName computed to be : %s", qPrintable(platformName)); - qInfo("Appearance ID computed as : %s", qPrintable(appearanceIdString)); + qInfo("Color Scheme computed as : %s", qPrintable(colorSchemeIdStr)); qInfo("Native style name is : %s", qPrintable(QQuickStyle::name())); } diff --git a/tests/manual/quickcontrols/headerview/main.qml b/tests/manual/quickcontrols/headerview/main.qml index 89367d91bf..d83696bdfa 100644 --- a/tests/manual/quickcontrols/headerview/main.qml +++ b/tests/manual/quickcontrols/headerview/main.qml @@ -14,7 +14,7 @@ Window { width: 640 height: 480 title: qsTr("HeaderView Test") - color: Qt.styleHints.appearance === Qt.Light ? palette.mid : palette.midlight + color: Qt.styleHints.colorScheme === Qt.Light ? palette.mid : palette.midlight TestTableModelWithHeader { id: tableModel |