diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-04-21 16:37:25 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-04-21 16:49:55 +0000 |
| commit | 2298df331b7d5922e480533d65e4d5d7861b2be9 (patch) | |
| tree | c6e3d33482ea7934055a5c56106de4374c3149f2 /src | |
| parent | 72bf8ccf5acc16648ed351ddb70d6fa95ee40648 (diff) | |
Fix SwipeDelegate to inherit ItemDelegate
Change-Id: I33df7b5002b898ee9c839eef588d6d4e1a9936de
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/quicktemplates2/qquickswipedelegate.cpp | 10 | ||||
| -rw-r--r-- | src/quicktemplates2/qquickswipedelegate_p.h | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/quicktemplates2/qquickswipedelegate.cpp b/src/quicktemplates2/qquickswipedelegate.cpp index aa54237c..ebc5a5f3 100644 --- a/src/quicktemplates2/qquickswipedelegate.cpp +++ b/src/quicktemplates2/qquickswipedelegate.cpp @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE /*! \qmltype SwipeDelegate - \inherits AbstractButton + \inherits ItemDelegate \instantiates QQuickSwipeDelegate \inqmlmodule Qt.labs.controls \brief A swipable item delegate. @@ -697,7 +697,7 @@ void QQuickSwipeDelegatePrivate::resizeContent() } QQuickSwipeDelegate::QQuickSwipeDelegate(QQuickItem *parent) : - QQuickAbstractButton(*(new QQuickSwipeDelegatePrivate(this)), parent) + QQuickItemDelegate(*(new QQuickSwipeDelegatePrivate(this)), parent) { setFiltersChildMouseEvents(true); } @@ -809,7 +809,7 @@ bool QQuickSwipeDelegate::childMouseEventFilter(QQuickItem *child, QEvent *event // Make sure that the control gets release events if it has created child // items that are stealing events from it. QMouseEvent *mouseEvent = static_cast<QMouseEvent *>(event); - QQuickAbstractButton::mouseReleaseEvent(mouseEvent); + QQuickItemDelegate::mouseReleaseEvent(mouseEvent); return d->handleMouseReleaseEvent(child, mouseEvent); } default: return false; @@ -821,7 +821,7 @@ bool QQuickSwipeDelegate::childMouseEventFilter(QQuickItem *child, QEvent *event void QQuickSwipeDelegate::mousePressEvent(QMouseEvent *event) { Q_D(QQuickSwipeDelegate); - QQuickAbstractButton::mousePressEvent(event); + QQuickItemDelegate::mousePressEvent(event); QQuickSwipeExposurePrivate *exposurePrivate = QQuickSwipeExposurePrivate::get(&d->exposure); exposurePrivate->positionBeforePress = exposurePrivate->position; exposurePrivate->velocityCalculator.startMeasuring(event->pos(), event->timestamp()); @@ -836,7 +836,7 @@ void QQuickSwipeDelegate::mouseMoveEvent(QMouseEvent *event) void QQuickSwipeDelegate::mouseReleaseEvent(QMouseEvent *event) { Q_D(QQuickSwipeDelegate); - QQuickAbstractButton::mouseReleaseEvent(event); + QQuickItemDelegate::mouseReleaseEvent(event); d->handleMouseReleaseEvent(this, event); } diff --git a/src/quicktemplates2/qquickswipedelegate_p.h b/src/quicktemplates2/qquickswipedelegate_p.h index d608994c..616ca355 100644 --- a/src/quicktemplates2/qquickswipedelegate_p.h +++ b/src/quicktemplates2/qquickswipedelegate_p.h @@ -48,14 +48,14 @@ // We mean it. // -#include <QtQuickTemplates2/private/qquickabstractbutton_p.h> +#include <QtQuickTemplates2/private/qquickitemdelegate_p.h> QT_BEGIN_NAMESPACE class QQuickSwipeDelegatePrivate; class QQuickSwipeExposure; -class Q_QUICKTEMPLATES2_EXPORT QQuickSwipeDelegate : public QQuickAbstractButton +class Q_QUICKTEMPLATES2_EXPORT QQuickSwipeDelegate : public QQuickItemDelegate { Q_OBJECT Q_PROPERTY(QQuickSwipeExposure *exposure READ exposure CONSTANT) |