diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-07-03 08:24:42 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-07-03 08:24:47 +0200 |
commit | 67d635fe2cc2c89c30486a2e26dea4106a9d9c16 (patch) | |
tree | b26f1bb7a9639f2b2a875c0cb2b937858b700add /sources/pyside2/doc/tutorials/basictutorial | |
parent | ffd068caf7063799e0196602e31ca7b1781c3f97 (diff) | |
parent | 75f824b13a2ef12a9a5a33db19216b4e43a72922 (diff) |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I389468b76913ac3c8113ab89833c756a7a72e54f
Diffstat (limited to 'sources/pyside2/doc/tutorials/basictutorial')
-rw-r--r-- | sources/pyside2/doc/tutorials/basictutorial/qml.rst | 2 | ||||
-rw-r--r-- | sources/pyside2/doc/tutorials/basictutorial/widgets.rst | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/sources/pyside2/doc/tutorials/basictutorial/qml.rst b/sources/pyside2/doc/tutorials/basictutorial/qml.rst index 0b26b3b83..81583096b 100644 --- a/sources/pyside2/doc/tutorials/basictutorial/qml.rst +++ b/sources/pyside2/doc/tutorials/basictutorial/qml.rst @@ -3,7 +3,7 @@ Your First Application Using PySide2 and QtQuick/QML QML is a declarative language that lets you develop applications faster than with traditional languages. It is ideal for designing the -UI of your applicataion because of its declarative nature. In QML, a +UI of your application because of its declarative nature. In QML, a user interface is specified as a tree of objects with properties. In this tutorial, we will show how to make a simple "Hello World" application with PySide2 and QML. diff --git a/sources/pyside2/doc/tutorials/basictutorial/widgets.rst b/sources/pyside2/doc/tutorials/basictutorial/widgets.rst index 80c137cac..c864e3d47 100644 --- a/sources/pyside2/doc/tutorials/basictutorial/widgets.rst +++ b/sources/pyside2/doc/tutorials/basictutorial/widgets.rst @@ -32,8 +32,7 @@ After the creation of the application object, we have created a # This HTML approach will be valid too! label = QLabel("<font color=red size=40>Hello World!</font>") -.. note:: After the creation of the label, we are calling the -method `show()` to show the label. +.. note:: After creating the label, we call `show()` on it. Finally, we call `app.exec_()` to enter the Qt main loop and start to execute the Qt code. In reality, it is only here where the label |