aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml
diff options
context:
space:
mode:
authorAndreas Buhr <andreas@andreasbuhr.de>2020-12-02 15:02:26 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2020-12-02 19:11:27 +0000
commitbbbe10f756fa4e56f2e8f22c8874625f5eeff753 (patch)
treebd5cc43bfc98049a1c9d2b192546d88ef055d756 /src/qml
parent6c5bae5704b6a5fc72f92b93cf220d7497951b4c (diff)
Fix usage of oldcode and newcode in qt6-changes.qdoc
There was wrong usage of \begincode and similar commands. This patch fixes it. Task-number: QTBUG-88533 Change-Id: I70b3d0104ba1dc8eb44556f35fc552e259317f88 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit ed098189d5809259378dc9a427a6fe6e303582ba) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/qml')
-rw-r--r--src/qml/doc/src/qt6-changes.qdoc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/doc/src/qt6-changes.qdoc b/src/qml/doc/src/qt6-changes.qdoc
index 087c500ab2..70c61849e7 100644
--- a/src/qml/doc/src/qt6-changes.qdoc
+++ b/src/qml/doc/src/qt6-changes.qdoc
@@ -49,9 +49,9 @@
assigned to an url property. In Qt 6 this is no longer the case.
If you had a QML file stored under "/home/qml/example.qml", and "example.qml" contained
- \begincode
+ \code
property url imageFolder: "./images"
- \oldcode
+ \endcode
then the url property would store the URL "/home/qml/images". This made it impossible to use
relative URLs in QML in this way, so in Qt 6, the URL stays relative, and only gets resolved
when this is required (e.g. when it is used as the source of an Image component).