diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-11-21 12:29:55 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-11-21 12:30:11 +0100 |
| commit | 88edd02b2bf872af5348531d05a47d7e15a61702 (patch) | |
| tree | 9abfa0fe13296d6035970581aab4b35a43ac1691 /src/quicktemplates2 | |
| parent | 244f144e332ca70033eba8b8536535008d2b215b (diff) | |
| parent | de4ff95cd166b13fb4818ada5493d913345ef0ef (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: If96a7e488b7964e56c06c9e367ff9c91f1bba526
Diffstat (limited to 'src/quicktemplates2')
| -rw-r--r-- | src/quicktemplates2/qquickbusyindicator.cpp | 1 | ||||
| -rw-r--r-- | src/quicktemplates2/qquickprogressbar.cpp | 1 | ||||
| -rw-r--r-- | src/quicktemplates2/qquickswipedelegate_p.h | 2 |
3 files changed, 1 insertions, 3 deletions
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 { 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(); |