diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-09-05 09:01:22 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-09-05 09:31:34 +0200 |
| commit | 2795ac5d5930fa28ea329529c0dd2e515b361531 (patch) | |
| tree | 8dd01197f5b71e1eb8e3612b0119764623325803 /examples/quick | |
| parent | 8f93d3627a9b76bf77896501129990e33a77f32c (diff) | |
| parent | 6ff0e9a65657e8c51a37e63efe8169bb7e3050cc (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/quick/items/qquickwindow.cpp
src/quick/scenegraph/qsgrenderloop.cpp
Change-Id: Idd7106995b5545fcac869e9056a365ef9edb36ca
Diffstat (limited to 'examples/quick')
| -rw-r--r-- | examples/quick/customitems/slideswitch/doc/src/example-slideswitch.qdoc | 2 | ||||
| -rw-r--r-- | examples/quick/demos/photoviewer/doc/src/photoviewer.qdoc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/quick/customitems/slideswitch/doc/src/example-slideswitch.qdoc b/examples/quick/customitems/slideswitch/doc/src/example-slideswitch.qdoc index 67a36eb8d8..d9703f6187 100644 --- a/examples/quick/customitems/slideswitch/doc/src/example-slideswitch.qdoc +++ b/examples/quick/customitems/slideswitch/doc/src/example-slideswitch.qdoc @@ -75,7 +75,7 @@ Item { the text will only be visible when the switch is on. -\section2 Images and user interaction +\section2 Images and User Interaction \snippet customitems/slideswitch/content/Switch.qml 4 First, we create the background image of the switch. diff --git a/examples/quick/demos/photoviewer/doc/src/photoviewer.qdoc b/examples/quick/demos/photoviewer/doc/src/photoviewer.qdoc index 9c0f8b337e..a107b19948 100644 --- a/examples/quick/demos/photoviewer/doc/src/photoviewer.qdoc +++ b/examples/quick/demos/photoviewer/doc/src/photoviewer.qdoc @@ -222,7 +222,7 @@ \printuntil onClicked \printuntil } - \section1 Laying out Photos on a Path + \section1 Laying Out Photos on a Path In AlbumDelegate.qml, we use a PathView type to lay out the photos provided by the \c visualModel.parts.stack model on a path that has the form of a |