qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

iOS Style: Update uses of renamed Qt.styleHints.colorScheme property 

Property was renamed in 32749c913b32e89e2027227233794f2296166cc6.
Update some uses of old name.

Unblacklist tests that were blacklisted as a result of this.

Fixes: QTBUG-111199
Fixes: QTBUG-111210
Pick-to: 6.5
Change-Id: I868382dec8951abb5e708805795b31f6b2144ff1
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Doris Verria 2023-02-16 15:43:04 +01:00 committed by Volker Hilsheimer
parent 921ec15f38
commit cf0c6459d8
6 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/quickcontrols/ios/Dialog.qml
View File

@ -39,8 +39,8 @@ T.Dialog {
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}
]
}
}

8
src/quickcontrols/ios/DialogButtonBox.qml
View File

@ -50,8 +50,8 @@ T.DialogButtonBox {
NinePatchImageSelector on source {
states: [
{"pressed": delegate.down},
{"light": Qt.styleHints.appearance === Qt.Light},
{"dark": Qt.styleHints.appearance === Qt.Dark},
{"light": Qt.styleHints.colorScheme === Qt.Light},
{"dark": Qt.styleHints.colorScheme === Qt.Dark},
]
}
}
@ -66,8 +66,8 @@ T.DialogButtonBox {
source: IOS.url + "dialogbuttonbox-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}
]
}
}

4
src/quickcontrols/ios/SelectionRectangle.qml
View File

@ -21,8 +21,8 @@ T.SelectionRectangle {
visible: SelectionRectangle.control.active
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}
]
}
}

4
src/quickcontrols/ios/ToolTip.qml
View File

@ -45,8 +45,8 @@ T.ToolTip {
source: IOS.url + "tooltip-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}
]
}
}

6
src/quickcontrols/ios/impl/DialogButtonBoxDelegate.qml
View File

@ -20,7 +20,7 @@ Button {
flat: true
contentItem: IconLabel {
readonly property var redColor: Qt.styleHints.appearance === Qt.Light ? "#ff3b30" : "#ff453a"
readonly property var redColor: Qt.styleHints.colorScheme === Qt.Light ? "#ff3b30" : "#ff453a"
text: delegate.text
font: delegate.font
spacing: delegate.spacing
@ -57,8 +57,8 @@ Button {
{"vertical": delegate.hasVerticalLayout},
{"last": delegate.hasVerticalLayout && delegate.isLastItem},
{"pressed": delegate.down},
{"light": Qt.styleHints.appearance === Qt.Light},
{"dark": Qt.styleHints.appearance === Qt.Dark},
{"light": Qt.styleHints.colorScheme === Qt.Light},
{"dark": Qt.styleHints.colorScheme === Qt.Dark},
]
}
}

9
tests/auto/quickcontrols/controls/ios/BLACKLIST
View File

@ -3,14 +3,5 @@
[ScrollView::test_textArea]
*
[SelectionRectangle::test_handleDragBottomRight_expand]
*
[SelectionRectangle::test_handleDragBottomRight_shrink]
*
[SelectionRectangle::test_handleDragTopLeft]
*
[SelectionRectangle::test_pressAndHold_on_top_of_handle]
*
[ComboBox::test_keyClose]
macos arm ci # QTBUG-102817