diff options
author | Liang Qi <liang.qi@qt.io> | 2017-10-30 08:45:06 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-10-30 09:17:43 +0100 |
commit | 1320f7f9840e94db66988f2dce265dfd373add27 (patch) | |
tree | 59d191178b86522b19fff44c592ac905326d86b1 /src/controls | |
parent | b2922baedd8b6a2aa1e6aa49a28e774e331c2be9 (diff) | |
parent | 296810ea4bb4f734881a517eb101e5b948c1905b (diff) | |
download | qtquickcontrols-1320f7f9840e94db66988f2dce265dfd373add27.tar.gz |
Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4
Conflicts:
.qmake.conf
Change-Id: Ia33462a31303ae79f7a6ef26dc6065a0afeef3e1
Diffstat (limited to 'src/controls')
-rw-r--r-- | src/controls/Private/qquickcontrolsettings.cpp | 2 | ||||
-rw-r--r-- | src/controls/Slider.qml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/controls/Private/qquickcontrolsettings.cpp b/src/controls/Private/qquickcontrolsettings.cpp index c7f641cc..d8cfdaed 100644 --- a/src/controls/Private/qquickcontrolsettings.cpp +++ b/src/controls/Private/qquickcontrolsettings.cpp @@ -222,7 +222,7 @@ QQuickControlSettings1::QQuickControlSettings1(QQmlEngine *engine) // If the style name is a path.. const QString styleNameFromEnvVar = styleEnvironmentVariable(); - if (QFile::exists(styleNameFromEnvVar)) { + if (!styleNameFromEnvVar.isEmpty() && QFile::exists(styleNameFromEnvVar)) { StyleData styleData; styleData.m_styleDirPath = styleNameFromEnvVar; m_styleMap[m_name] = styleData; diff --git a/src/controls/Slider.qml b/src/controls/Slider.qml index c4d25ac2..e290640e 100644 --- a/src/controls/Slider.qml +++ b/src/controls/Slider.qml @@ -187,10 +187,10 @@ Control { /*! \internal The extra arguments positionAtMinimum and positionAtMaximum are there to force re-evaluation of the handle position when the constraints change (QTBUG-41255), - and the same for range.minimumValue (QTBUG-51765). + and the same for range.minimumValue (QTBUG-51765) and range.maximumValue (QTBUG-63354). */ property real __handlePos: range.valueForPosition(__horizontal ? fakeHandle.x : fakeHandle.y, - range.positionAtMinimum, range.positionAtMaximum, range.minimumValue) + range.positionAtMinimum, range.positionAtMaximum, range.minimumValue, range.maximumValue) activeFocusOnTab: true |