summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-07-29 01:01:08 +0200
committerEdward Welbourne <edward.welbourne@qt.io>2018-07-30 16:35:04 +0200
commit83a73c8e5a05a1d3795fdbbad8b5b553e5bd723f (patch)
tree7c336f32ed6b76233f4988cfb0910973a231e51a /examples
parentb8fd580cb3453b3850c36765c4b2537538d2f4f8 (diff)
parent1d815780e020a7315dfc4762b6b0280834203e7e (diff)
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts: examples/quick/tableview/pixelator/main.cpp examples/quick/demos/ Change-Id: Id7eaae6584017a4ab4ec9dd97b56d5c1a417f0e3
Diffstat (limited to 'examples')
-rw-r--r--examples/quick/demos/photoviewer/i18n/qml_en.qmbin23 -> 0 bytes
-rw-r--r--examples/quick/demos/photoviewer/i18n/qml_en.ts4
-rw-r--r--examples/quick/imageelements/doc/src/imageelements.qdoc10
3 files changed, 5 insertions, 9 deletions
diff --git a/examples/quick/demos/photoviewer/i18n/qml_en.qm b/examples/quick/demos/photoviewer/i18n/qml_en.qm
deleted file mode 100644
index 9dad8dffce..0000000000
--- a/examples/quick/demos/photoviewer/i18n/qml_en.qm
+++ /dev/null
Binary files differ
diff --git a/examples/quick/demos/photoviewer/i18n/qml_en.ts b/examples/quick/demos/photoviewer/i18n/qml_en.ts
deleted file mode 100644
index 5315a75526..0000000000
--- a/examples/quick/demos/photoviewer/i18n/qml_en.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="en">
-</TS>
diff --git a/examples/quick/imageelements/doc/src/imageelements.qdoc b/examples/quick/imageelements/doc/src/imageelements.qdoc
index e32293907c..2c6490fb2c 100644
--- a/examples/quick/imageelements/doc/src/imageelements.qdoc
+++ b/examples/quick/imageelements/doc/src/imageelements.qdoc
@@ -36,29 +36,29 @@
\include examples-run.qdocinc
- \section1 BorderImage
+ \section1 Scaling with BorderImage
\e BorderImage shows off the various scaling modes of the \l BorderImage
type by setting its horizontalTileMode and verticalTileMode properties.
- \section1 Image
+ \section1 Image Fill
\e Image shows off the various fill modes of the \l Image type.
- \section1 Shadows
+ \section1 Shadow Effects
\e Shadows shows how to create a drop shadow effect for a rectangular item
using a \l BorderImage:
\snippet imageelements/content/ShadowRectangle.qml shadow
- \section1 AnimatedSprite
+ \section1 Sprite Animations with AnimatedSprite
\e AnimatedSprite shows how to display a simple animation using an
\l AnimatedSprite object:
\snippet imageelements/animatedsprite.qml sprite
The sprite animation will loop three times.
- \section1 SpriteSequence
+ \section1 Sprite Animations with SpriteSequence
\e SpriteSequence demonstrates using a sprite sequence to draw an animated
and interactive bear. The \l SpriteSequence object defines five different