aboutsummaryrefslogtreecommitdiffstats
path: root/sources/pyside2/doc/tutorials/qmlintegration/qmlintegration.rst
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2019-11-04 12:34:17 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2019-11-04 12:42:35 +0100
commit1704567d7ad0d21dd3b588af7aad40cd244c1799 (patch)
tree932b42988e482f01125dcbf4d470e9a56107689a /sources/pyside2/doc/tutorials/qmlintegration/qmlintegration.rst
parent1d77cd18510412242384c5b37a00efd5b6ce8a26 (diff)
parentc98ef56544cd54661b61529829caf6a799a1a94f (diff)
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
Diffstat (limited to 'sources/pyside2/doc/tutorials/qmlintegration/qmlintegration.rst')
-rw-r--r--sources/pyside2/doc/tutorials/qmlintegration/qmlintegration.rst16
1 files changed, 8 insertions, 8 deletions
diff --git a/sources/pyside2/doc/tutorials/qmlintegration/qmlintegration.rst b/sources/pyside2/doc/tutorials/qmlintegration/qmlintegration.rst
index 36a12381d..62336ee81 100644
--- a/sources/pyside2/doc/tutorials/qmlintegration/qmlintegration.rst
+++ b/sources/pyside2/doc/tutorials/qmlintegration/qmlintegration.rst
@@ -31,7 +31,7 @@ application and PySide2 integration:
.. literalinclude:: main.py
:linenos:
:lines: 98-108
- :emphasize-lines: 103,107
+ :emphasize-lines: 6,9
Notice that we specify the name of the context property, **con**,
and also we explicitly load our QML file.
@@ -47,7 +47,7 @@ application and PySide2 integration:
.. literalinclude:: view.qml
:linenos:
:lines: 85-93
- :emphasize-lines: 89-91
+ :emphasize-lines: 5-7
The properties *Italic*, *Bold*, and *Underline* are mutually
exclusive, this means only one can be active at any time.
@@ -64,7 +64,7 @@ application and PySide2 integration:
.. literalinclude:: main.py
:linenos:
:lines: 79-84
- :emphasize-lines: 82,84
+ :emphasize-lines: 4,6
Returning *True* or *False* allows you to activate and deactivate
the properties of the QML UI elements.
@@ -98,14 +98,14 @@ application and PySide2 integration:
.. literalinclude:: main.py
:linenos:
:lines: 41-48
- :emphasize-lines: 48
+ :emphasize-lines: 8
- You can read more about this configuration file
- `here <https://doc.qt.io/qt-5/qtquickcontrols2-configuration.html>`_.
+ You can read more about this configuration file
+ `here <https://doc.qt.io/qt-5/qtquickcontrols2-configuration.html>`_.
The final look of your application will be:
.. image:: textproperties_material.png
-You can download `view.qml <view.qml>`_ and `main.py <main.py>`_
-to try this example.
+You can :download:`view.qml <view.qml>` and
+:download:`main.py <main.py>` to try this example.