diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2014-06-25 10:27:39 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@digia.com> | 2014-06-25 10:27:39 +0200 |
| commit | 91caf7531476d16c1c7a6d22705cb36ac93c5ab7 (patch) | |
| tree | e4f67bcd61c55ba2b8cb4a4d01b10f69837c74e8 /src/controls/Styles/Base/CalendarStyle.qml | |
| parent | 1f0def9e8feca180680c1344cef6cf250b7630ba (diff) | |
| parent | 6b876b21cd23f2af879543edf773dac41b4d0e97 (diff) | |
| download | qtquickcontrols-91caf7531476d16c1c7a6d22705cb36ac93c5ab7.tar.gz | |
Merge remote-tracking branch 'origin/5.3' into dev
Conflicts:
.qmake.conf
src/controls/Styles/Desktop/SpinBoxStyle.qml
Change-Id: Ia501c1388a2af9f273ec2742abbfc766717ad9e6
Diffstat (limited to 'src/controls/Styles/Base/CalendarStyle.qml')
| -rw-r--r-- | src/controls/Styles/Base/CalendarStyle.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/controls/Styles/Base/CalendarStyle.qml b/src/controls/Styles/Base/CalendarStyle.qml index b5485d82..26ca2048 100644 --- a/src/controls/Styles/Base/CalendarStyle.qml +++ b/src/controls/Styles/Base/CalendarStyle.qml @@ -272,7 +272,7 @@ Style { readonly property bool addExtraMargin: control.frameVisible && styleData.selected readonly property color sameMonthDateTextColor: "#444" - readonly property color selectedDateColor: Qt.platform.os === "osx" ? "#3778d0" : __syspal.highlight + readonly property color selectedDateColor: Qt.platform.os === "osx" ? "#3778d0" : SystemPaletteSingleton.highlight(control.enabled) readonly property color selectedDateTextColor: "white" readonly property color differentMonthDateTextColor: "#bbb" readonly property color invalidDateColor: "#dddddd" |