summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Hilsheimer <volker.hilsheimer@qt.io>2023-03-31 16:43:54 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2023-04-03 10:35:03 +0000
commitb819dd1f98d9e268e478fe75dfb0963586d6575b (patch)
tree9b103073f4e1d84382585ea9ed8113dca61a0e23
parent9bf93a468d1c39f982485bccd83e624bc77c1bd6 (diff)
downloadqtdoc-b819dd1f98d9e268e478fe75dfb0963586d6575b.tar.gz
Docs: fix warnings after changes to photosurface demo
Fix link after the page was renamed, and fix quoting logic to account for the slide show logic. Change-Id: I76e50ce3f8a6f4c1701ea2ed18623a8f66467b5f Reviewed-by: Axel Spoerl <axel.spoerl@qt.io> (cherry picked from commit c8362caa5afe6a509151617baefc5eabdbeac3a0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--doc/src/howtos/appicon.qdoc4
-rw-r--r--examples/demos/photosurface/doc/src/photosurface.qdoc6
2 files changed, 5 insertions, 5 deletions
diff --git a/doc/src/howtos/appicon.qdoc b/doc/src/howtos/appicon.qdoc
index 6063350f..3c7ffc50 100644
--- a/doc/src/howtos/appicon.qdoc
+++ b/doc/src/howtos/appicon.qdoc
@@ -51,7 +51,7 @@
Once you have the \c .rc file, add information about the ICO file to it and
use it to configure your application icon.
- The following snippet demonstrates how the \l{Qt Quick Demo - Photo Surface}
+ The following snippet demonstrates how the \l{Photo Surface}
example application uses CMake to set up an application icon:
\snippet demos/photosurface/CMakeLists.txt appicon_windows
@@ -109,7 +109,7 @@
by CMake must contain the icon information. This can be achieved by
setting the \c .icns file name to the \c MACOSX_BUNDLE_ICON_FILE variable.
- The following snippet demonstrates how the \l{Qt Quick Demo - Photo Surface}
+ The following snippet demonstrates how the \l{Photo Surface}
example application uses CMake to set up an application icon:
\snippet demos/photosurface/CMakeLists.txt appicon_macOS
diff --git a/examples/demos/photosurface/doc/src/photosurface.qdoc b/examples/demos/photosurface/doc/src/photosurface.qdoc
index a0c9133c..da089734 100644
--- a/examples/demos/photosurface/doc/src/photosurface.qdoc
+++ b/examples/demos/photosurface/doc/src/photosurface.qdoc
@@ -63,10 +63,10 @@
\endcode
We use the \c {folderDialog.open()} function to open the file dialog when the
- app starts, if a folder path has not already been given as a command-line argument:
+ initial slide show finishes, unless a folder path has been given as a command-line
+ argument:
- \skipto StandardKey.Quit
- \skipto Component.onCompleted: {
+ \skipto Component.onDestruction: {
\printuntil }
Users can also click the folder dialog icon to open it. We use