From 236491b5b562066381be8ea2fd08f88a9b4dc2ed Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Fri, 18 Nov 2016 15:09:49 +0100 Subject: SwipeDelegate: comment out the revision of swipe.completed() The QML engine cannot handle revisioned grouped or attached properties: import QtQuick.Controls 2.1 SwipeDelegate { swipe.onCompleted: { } } => ".onCompleted" is not available due to component versioning." Change-Id: I5bc944aeac7c7f16f482208a523110ccaa42241b Reviewed-by: Mitch Curtis --- src/quicktemplates2/qquickswipedelegate_p.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/quicktemplates2') diff --git a/src/quicktemplates2/qquickswipedelegate_p.h b/src/quicktemplates2/qquickswipedelegate_p.h index 49f6c939..ae23672b 100644 --- a/src/quicktemplates2/qquickswipedelegate_p.h +++ b/src/quicktemplates2/qquickswipedelegate_p.h @@ -134,7 +134,7 @@ public: Q_SIGNALS: void positionChanged(); void completeChanged(); - Q_REVISION(1) void completed(); + /*Q_REVISION(1)*/ void completed(); void leftChanged(); void behindChanged(); void rightChanged(); -- cgit v1.2.3 From de4ff95cd166b13fb4818ada5493d913345ef0ef Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Sun, 20 Nov 2016 07:43:13 +0100 Subject: Whitespace fixes Change-Id: I4eab43944ec03b79d713db1c6756e76cbfa38b30 Reviewed-by: J-P Nurmi --- src/quicktemplates2/qquickbusyindicator.cpp | 1 - src/quicktemplates2/qquickprogressbar.cpp | 1 - 2 files changed, 2 deletions(-) (limited to 'src/quicktemplates2') diff --git a/src/quicktemplates2/qquickbusyindicator.cpp b/src/quicktemplates2/qquickbusyindicator.cpp index 2cd3f62d..a59a8e5f 100644 --- a/src/quicktemplates2/qquickbusyindicator.cpp +++ b/src/quicktemplates2/qquickbusyindicator.cpp @@ -98,7 +98,6 @@ QQuickBusyIndicator::QQuickBusyIndicator(QQuickItem *parent) : \note The indicator is only visible when this property is set to \c true. The default value is \c true. - */ bool QQuickBusyIndicator::isRunning() const { diff --git a/src/quicktemplates2/qquickprogressbar.cpp b/src/quicktemplates2/qquickprogressbar.cpp index d8ada6f4..9c198312 100644 --- a/src/quicktemplates2/qquickprogressbar.cpp +++ b/src/quicktemplates2/qquickprogressbar.cpp @@ -234,7 +234,6 @@ qreal QQuickProgressBar::visualPosition() const doesn't show how much progress has been made. \image qtquickcontrols2-progressbar-indeterminate.gif - */ bool QQuickProgressBar::isIndeterminate() const { -- cgit v1.2.3