diff options
Diffstat (limited to 'src')
-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 |