diff options
Diffstat (limited to 'sources/pyside6/doc/tutorials/qmlintegration')
| -rw-r--r-- | sources/pyside6/doc/tutorials/qmlintegration/Main/qmldir | 2 | ||||
| -rw-r--r-- | sources/pyside6/doc/tutorials/qmlintegration/QmlIntegration/Main.qml (renamed from sources/pyside6/doc/tutorials/qmlintegration/Main/Main.qml) | 0 | ||||
| -rw-r--r-- | sources/pyside6/doc/tutorials/qmlintegration/QmlIntegration/qmldir | 2 | ||||
| -rw-r--r-- | sources/pyside6/doc/tutorials/qmlintegration/main.py | 2 | ||||
| -rw-r--r-- | sources/pyside6/doc/tutorials/qmlintegration/qmlintegration.rst | 10 |
5 files changed, 8 insertions, 8 deletions
diff --git a/sources/pyside6/doc/tutorials/qmlintegration/Main/qmldir b/sources/pyside6/doc/tutorials/qmlintegration/Main/qmldir deleted file mode 100644 index 8ad738e16..000000000 --- a/sources/pyside6/doc/tutorials/qmlintegration/Main/qmldir +++ /dev/null @@ -1,2 +0,0 @@ -module Main -Main 254.0 Main.qml diff --git a/sources/pyside6/doc/tutorials/qmlintegration/Main/Main.qml b/sources/pyside6/doc/tutorials/qmlintegration/QmlIntegration/Main.qml index 635603fac..635603fac 100644 --- a/sources/pyside6/doc/tutorials/qmlintegration/Main/Main.qml +++ b/sources/pyside6/doc/tutorials/qmlintegration/QmlIntegration/Main.qml diff --git a/sources/pyside6/doc/tutorials/qmlintegration/QmlIntegration/qmldir b/sources/pyside6/doc/tutorials/qmlintegration/QmlIntegration/qmldir new file mode 100644 index 000000000..3dbea626f --- /dev/null +++ b/sources/pyside6/doc/tutorials/qmlintegration/QmlIntegration/qmldir @@ -0,0 +1,2 @@ +module QmlIntegration +Main 254.0 Main.qml diff --git a/sources/pyside6/doc/tutorials/qmlintegration/main.py b/sources/pyside6/doc/tutorials/qmlintegration/main.py index 574e314de..f08ad099f 100644 --- a/sources/pyside6/doc/tutorials/qmlintegration/main.py +++ b/sources/pyside6/doc/tutorials/qmlintegration/main.py @@ -54,7 +54,7 @@ if __name__ == '__main__': engine = QQmlApplicationEngine() # Add the current directory to the import paths and load the main module. engine.addImportPath(sys.path[0]) - engine.loadFromModule("Main", "Main") + engine.loadFromModule("QmlIntegration", "Main") if not engine.rootObjects(): sys.exit(-1) diff --git a/sources/pyside6/doc/tutorials/qmlintegration/qmlintegration.rst b/sources/pyside6/doc/tutorials/qmlintegration/qmlintegration.rst index 5bae0bb6c..1caf18d45 100644 --- a/sources/pyside6/doc/tutorials/qmlintegration/qmlintegration.rst +++ b/sources/pyside6/doc/tutorials/qmlintegration/qmlintegration.rst @@ -63,7 +63,7 @@ application and PySide6 integration: This :code:`id` will help you to get a reference to the element that was registered from Python. - .. literalinclude:: Main/Main.qml + .. literalinclude:: QmlIntegration/Main.qml :linenos: :lines: 45-55 :emphasize-lines: 6-8 @@ -77,12 +77,12 @@ application and PySide6 integration: will return *False*, that is how we make sure only one is being applied to the text. -#. Put the file into into a directory named :code:`Main` along +#. Put the file into into a directory named :code:`QmlIntegration` along with a file named :code:`qmldir` to describe a basic QML module: .. code-block:: text - module Main + module QmlIntegration Main 254.0 Main.qml #. Each slot verifies if the selected option contains the text associated @@ -133,6 +133,6 @@ application and PySide6 integration: .. image:: textproperties_material.png -You can download :download:`Main.qml <Main/Main.qml>`, -:download:`qmldir <Main/qmldir>` and :download:`main.py <main.py>` +You can download :download:`Main.qml <QmlIntegration/Main.qml>`, +:download:`qmldir <QmlIntegration/qmldir>` and :download:`main.py <main.py>` to try this example. |
