aboutsummaryrefslogtreecommitdiffstats
path: root/src/controls
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@theqtcompany.com>2015-08-10 17:21:49 +0200
committerMitch Curtis <mitch.curtis@theqtcompany.com>2015-08-11 12:46:22 +0000
commitdacecc6a36ddcc2cc60b11c5fe51377281d07c2a (patch)
tree6c5d2f06d09871f1d5be5ccff52b15e92ddfab37 /src/controls
parentd5c2e819cffe417813296904ed8ed858a5e111fc (diff)
Add and update GIFs.
Change-Id: Ia3bb2b8a4bcbe98f6ceabeb4f57f254cd625bb37 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/controls')
-rw-r--r--src/controls/doc/images/qtquickcontrols2-busyindicator.gifbin0 -> 30448 bytes
-rw-r--r--src/controls/doc/images/qtquickcontrols2-button.gifbin0 -> 3913 bytes
-rw-r--r--src/controls/doc/images/qtquickcontrols2-slider.gifbin9044 -> 13283 bytes
-rw-r--r--src/controls/doc/images/qtquickcontrols2-switch.gifbin0 -> 3320 bytes
-rw-r--r--src/controls/qquickbusyindicator.cpp2
-rw-r--r--src/controls/qquickbutton.cpp2
-rw-r--r--src/controls/qquickswitch.cpp2
7 files changed, 6 insertions, 0 deletions
diff --git a/src/controls/doc/images/qtquickcontrols2-busyindicator.gif b/src/controls/doc/images/qtquickcontrols2-busyindicator.gif
new file mode 100644
index 00000000..46633c34
--- /dev/null
+++ b/src/controls/doc/images/qtquickcontrols2-busyindicator.gif
Binary files differ
diff --git a/src/controls/doc/images/qtquickcontrols2-button.gif b/src/controls/doc/images/qtquickcontrols2-button.gif
new file mode 100644
index 00000000..9f08f458
--- /dev/null
+++ b/src/controls/doc/images/qtquickcontrols2-button.gif
Binary files differ
diff --git a/src/controls/doc/images/qtquickcontrols2-slider.gif b/src/controls/doc/images/qtquickcontrols2-slider.gif
index d9c98811..59c94796 100644
--- a/src/controls/doc/images/qtquickcontrols2-slider.gif
+++ b/src/controls/doc/images/qtquickcontrols2-slider.gif
Binary files differ
diff --git a/src/controls/doc/images/qtquickcontrols2-switch.gif b/src/controls/doc/images/qtquickcontrols2-switch.gif
new file mode 100644
index 00000000..b2e1b548
--- /dev/null
+++ b/src/controls/doc/images/qtquickcontrols2-switch.gif
Binary files differ
diff --git a/src/controls/qquickbusyindicator.cpp b/src/controls/qquickbusyindicator.cpp
index ddb55c4b..cc15f432 100644
--- a/src/controls/qquickbusyindicator.cpp
+++ b/src/controls/qquickbusyindicator.cpp
@@ -47,6 +47,8 @@ QT_BEGIN_NAMESPACE
\ingroup indicators
\brief A busy indicator.
+ \image qtquickcontrols2-busyindicator.gif
+
The busy indicator should be used to indicate activity while content is
being loaded or the UI is blocked waiting for a resource to become available.
diff --git a/src/controls/qquickbutton.cpp b/src/controls/qquickbutton.cpp
index 2359d4f1..f84489a2 100644
--- a/src/controls/qquickbutton.cpp
+++ b/src/controls/qquickbutton.cpp
@@ -47,6 +47,8 @@ QT_BEGIN_NAMESPACE
\ingroup buttons
\brief A button control.
+ \image qtquickcontrols2-button.gif
+
Button presents a push-button control that can be pushed or clicked by
the user. Buttons are normally used to perform an action, or to answer
a question. Typical buttons are \e OK, \e Apply, \e Cancel, \e Close,
diff --git a/src/controls/qquickswitch.cpp b/src/controls/qquickswitch.cpp
index 630826fc..9eec7c16 100644
--- a/src/controls/qquickswitch.cpp
+++ b/src/controls/qquickswitch.cpp
@@ -49,6 +49,8 @@ QT_BEGIN_NAMESPACE
\ingroup buttons
\brief A switch control.
+ \image qtquickcontrols2-switch.gif
+
Switch is an option button that can be dragged or toggled on (checked) or
off (unchecked). Switches are typically used to select between two states.