diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-01 09:56:19 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-03-01 10:05:21 +0100 |
| commit | 91d1fc42d37501555fea3674b93f5fd81401b518 (patch) | |
| tree | 5c9150606db89a00989d7a3450c287efbeb1b7cd /src/quicktemplates2/qquickrangeslider.cpp | |
| parent | 8b5490c3acb2731cc5bf7b968128138d96259939 (diff) | |
| parent | a19ab6806043591abf94868de6962a3747284da7 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: Ia4c692552e6573b33b2e0f6b43b2a482a78ad970
Diffstat (limited to 'src/quicktemplates2/qquickrangeslider.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickrangeslider.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quicktemplates2/qquickrangeslider.cpp b/src/quicktemplates2/qquickrangeslider.cpp index 258a2f91..1c74f9ee 100644 --- a/src/quicktemplates2/qquickrangeslider.cpp +++ b/src/quicktemplates2/qquickrangeslider.cpp @@ -230,7 +230,7 @@ void QQuickRangeSliderNode::setHandle(QQuickItem *handle) if (d->handle == handle) return; - QQuickControlPrivate::get(d->slider)->deleteDelegate(d->handle); + QQuickControlPrivate::destroyDelegate(d->handle, d->slider); d->handle = handle; if (handle) { if (!handle->parentItem()) @@ -1116,7 +1116,7 @@ void QQuickRangeSlider::componentComplete() \sa second */ -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::Role QQuickRangeSlider::accessibleRole() const { return QAccessible::Slider; |