aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@qt.io>2016-10-06 12:44:04 +0200
committerMitch Curtis <mitch.curtis@qt.io>2016-10-06 14:43:25 +0000
commit78179e8b77fddbc6f017e5007fe157425a8eb6e4 (patch)
tree6b25e27271ae2a85ec9be94150c35762c82ceff8 /src
parent18920258393030124186dc589c99d1164b576108 (diff)
ScrollIndicator: replace PNGs with GIFs
Change-Id: I04d55b0e2e089cb55c26b921409ff2e5e58f55d9 Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-scrollindicator.gifbin0 -> 42352 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-scrollindicator.pngbin387 -> 0 bytes
-rw-r--r--src/imports/controls/doc/src/qtquickcontrols2-indicators.qdoc2
-rw-r--r--src/quicktemplates2/qquickscrollindicator.cpp4
4 files changed, 3 insertions, 3 deletions
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator.gif b/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator.gif
new file mode 100644
index 00000000..73007820
--- /dev/null
+++ b/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator.gif
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator.png b/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator.png
deleted file mode 100644
index ea0923cc..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator.png
+++ /dev/null
Binary files differ
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-indicators.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-indicators.qdoc
index 47e6be82..03750844 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-indicators.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-indicators.qdoc
@@ -62,7 +62,7 @@
\section1 ScrollIndicator Control
- \image qtquickcontrols2-scrollindicator.png
+ \image qtquickcontrols2-scrollindicator.gif
\l ScrollIndicator is a non-interactive indicator that indicates the
current scroll position, and can be used to scroll to a specific position in a
diff --git a/src/quicktemplates2/qquickscrollindicator.cpp b/src/quicktemplates2/qquickscrollindicator.cpp
index 1c2700bc..48adda0a 100644
--- a/src/quicktemplates2/qquickscrollindicator.cpp
+++ b/src/quicktemplates2/qquickscrollindicator.cpp
@@ -52,12 +52,12 @@ QT_BEGIN_NAMESPACE
\ingroup qtquickcontrols2-indicators
\brief A non-interactive scroll indicator control.
+ \image qtquickcontrols2-scrollindicator.gif
+
ScrollIndicator is a non-interactive indicator that indicates the current scroll
position. A scroll indicator can be either \l vertical or \l horizontal, and can
be attached to any \l Flickable, such as \l ListView and \l GridView.
- \image qtquickcontrols2-scrollindicator.png
-
\code
Flickable {
// ...