aboutsummaryrefslogtreecommitdiffstats
path: root/sources/pyside6/doc/tutorials/qmlapp
diff options
context:
space:
mode:
Diffstat (limited to 'sources/pyside6/doc/tutorials/qmlapp')
-rw-r--r--sources/pyside6/doc/tutorials/qmlapp/App/Main.qml (renamed from sources/pyside6/doc/tutorials/qmlapp/Main/Main.qml)0
-rw-r--r--sources/pyside6/doc/tutorials/qmlapp/App/logo.png (renamed from sources/pyside6/doc/tutorials/qmlapp/Main/logo.png)bin6208 -> 6208 bytes
-rw-r--r--sources/pyside6/doc/tutorials/qmlapp/App/qmldir (renamed from sources/pyside6/doc/tutorials/qmlapp/Main/qmldir)2
-rw-r--r--sources/pyside6/doc/tutorials/qmlapp/main.py2
-rw-r--r--sources/pyside6/doc/tutorials/qmlapp/qmlapplication.rst8
5 files changed, 6 insertions, 6 deletions
diff --git a/sources/pyside6/doc/tutorials/qmlapp/Main/Main.qml b/sources/pyside6/doc/tutorials/qmlapp/App/Main.qml
index 7f9b1d777..7f9b1d777 100644
--- a/sources/pyside6/doc/tutorials/qmlapp/Main/Main.qml
+++ b/sources/pyside6/doc/tutorials/qmlapp/App/Main.qml
diff --git a/sources/pyside6/doc/tutorials/qmlapp/Main/logo.png b/sources/pyside6/doc/tutorials/qmlapp/App/logo.png
index 30c621c9c..30c621c9c 100644
--- a/sources/pyside6/doc/tutorials/qmlapp/Main/logo.png
+++ b/sources/pyside6/doc/tutorials/qmlapp/App/logo.png
Binary files differ
diff --git a/sources/pyside6/doc/tutorials/qmlapp/Main/qmldir b/sources/pyside6/doc/tutorials/qmlapp/App/qmldir
index 8ad738e16..f093374fa 100644
--- a/sources/pyside6/doc/tutorials/qmlapp/Main/qmldir
+++ b/sources/pyside6/doc/tutorials/qmlapp/App/qmldir
@@ -1,2 +1,2 @@
-module Main
+module App
Main 254.0 Main.qml
diff --git a/sources/pyside6/doc/tutorials/qmlapp/main.py b/sources/pyside6/doc/tutorials/qmlapp/main.py
index 3ab440531..254d75f1e 100644
--- a/sources/pyside6/doc/tutorials/qmlapp/main.py
+++ b/sources/pyside6/doc/tutorials/qmlapp/main.py
@@ -35,7 +35,7 @@ if __name__ == '__main__':
# Load the QML file
# Add the current directory to the import paths and load the main module.
view.engine().addImportPath(sys.path[0])
- view.loadFromModule("Main", "Main")
+ view.loadFromModule("App", "Main")
# Show the window
if view.status() == QQuickView.Error:
diff --git a/sources/pyside6/doc/tutorials/qmlapp/qmlapplication.rst b/sources/pyside6/doc/tutorials/qmlapp/qmlapplication.rst
index e09dee598..9dd3e4347 100644
--- a/sources/pyside6/doc/tutorials/qmlapp/qmlapplication.rst
+++ b/sources/pyside6/doc/tutorials/qmlapp/qmlapplication.rst
@@ -44,9 +44,9 @@ development process using *Qt Creator*:
This should create a ``main.py`` and ```main.pyproject`` files
for the project.
-#. Download :download:`Main.qml<Main/Main.qml>`, :download:`qmldir<Main/qmldir>`
- and :download:`logo.png <Main/logo.png>` and place them in a subdirectory
- named `Main` in your project folder. This creates a basic QML module.
+#. Download :download:`Main.qml<App/Main.qml>`, :download:`qmldir<App/qmldir>`
+ and :download:`logo.png <App/logo.png>` and place them in a subdirectory
+ named `App` in your project folder. This creates a basic QML module.
#. Double-click on ``main.pyproject`` to open it in edit mode, and append
``view.qml`` and ``logo.png`` to the **files** list. This is how your
@@ -55,7 +55,7 @@ development process using *Qt Creator*:
.. code::
{
- "files": ["main.py", "Main/Main.qml", "Main/logo.png", "Main/qmldir"]
+ "files": ["main.py", "App/Main.qml", "App/logo.png", "App/qmldir"]
}
#. Now that you have the necessary bits for the application, import the