diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-04-28 11:47:23 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-05-02 16:44:15 +0200 |
| commit | fbb22873530c200b4ddb9b2da91764948bb9da71 (patch) | |
| tree | 88c64bde71483b6f68c5770e145268282f856c8f /examples/qml/referenceexamples/grouped | |
| parent | 2c166425cf4143a6c5f6744ffa959a1b77b13e36 (diff) | |
Port the QML reference examples to QML module usage
As a drive-by fix the example origin where applicable.
Task-number: PYSIDE-2206
Task-number: QTBUG-111033
Pick-to: 6.5
Change-Id: If3b17435c17310c3f6c196f7653c7025ad359366
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
Diffstat (limited to 'examples/qml/referenceexamples/grouped')
| -rw-r--r-- | examples/qml/referenceexamples/grouped/People/Main.qml (renamed from examples/qml/referenceexamples/grouped/example.qml) | 2 | ||||
| -rw-r--r-- | examples/qml/referenceexamples/grouped/People/qmldir | 3 | ||||
| -rw-r--r-- | examples/qml/referenceexamples/grouped/birthdayparty.py | 2 | ||||
| -rw-r--r-- | examples/qml/referenceexamples/grouped/grouped.pyproject | 3 | ||||
| -rw-r--r-- | examples/qml/referenceexamples/grouped/main.py | 11 | ||||
| -rw-r--r-- | examples/qml/referenceexamples/grouped/person.py | 2 |
6 files changed, 14 insertions, 9 deletions
diff --git a/examples/qml/referenceexamples/grouped/example.qml b/examples/qml/referenceexamples/grouped/People/Main.qml index d0db4f193..3c34234fd 100644 --- a/examples/qml/referenceexamples/grouped/example.qml +++ b/examples/qml/referenceexamples/grouped/People/Main.qml @@ -3,7 +3,7 @@ import QtQuick -import examples.grouped.people +import People BirthdayParty { host: Boy { diff --git a/examples/qml/referenceexamples/grouped/People/qmldir b/examples/qml/referenceexamples/grouped/People/qmldir new file mode 100644 index 000000000..a2bd9515a --- /dev/null +++ b/examples/qml/referenceexamples/grouped/People/qmldir @@ -0,0 +1,3 @@ +module People +typeinfo coercion.qmltypes +Main 1.0 Main.qml diff --git a/examples/qml/referenceexamples/grouped/birthdayparty.py b/examples/qml/referenceexamples/grouped/birthdayparty.py index 9f414441e..8c6f7e8fb 100644 --- a/examples/qml/referenceexamples/grouped/birthdayparty.py +++ b/examples/qml/referenceexamples/grouped/birthdayparty.py @@ -9,7 +9,7 @@ from person import Person # To be used on the @QmlElement decorator # (QML_IMPORT_MINOR_VERSION is optional) -QML_IMPORT_NAME = "examples.grouped.people" +QML_IMPORT_NAME = "People" QML_IMPORT_MAJOR_VERSION = 1 diff --git a/examples/qml/referenceexamples/grouped/grouped.pyproject b/examples/qml/referenceexamples/grouped/grouped.pyproject index 3c01c40c2..09942ebcc 100644 --- a/examples/qml/referenceexamples/grouped/grouped.pyproject +++ b/examples/qml/referenceexamples/grouped/grouped.pyproject @@ -1,3 +1,4 @@ { - "files": ["main.py", "birthdayparty.py", "person.py", "example.qml"] + "files": ["main.py", "birthdayparty.py", "person.py", + "People/Main.qml", "People/qmldir"] } diff --git a/examples/qml/referenceexamples/grouped/main.py b/examples/qml/referenceexamples/grouped/main.py index f1edb8b94..657ce272b 100644 --- a/examples/qml/referenceexamples/grouped/main.py +++ b/examples/qml/referenceexamples/grouped/main.py @@ -1,12 +1,12 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -"""PySide6 port of the qml/examples/qml/referenceexamples/default example from Qt v6.x""" +"""PySide6 port of the qml/examples/qml/tutorials/extending-qml-advanced/advanced4-Grouped-properties example from Qt v6.x""" from pathlib import Path import sys -from PySide6.QtCore import QCoreApplication, QUrl +from PySide6.QtCore import QCoreApplication from PySide6.QtQml import QQmlComponent, QQmlEngine from person import Boy, Girl @@ -15,10 +15,11 @@ from birthdayparty import BirthdayParty if __name__ == '__main__': app = QCoreApplication(sys.argv) - qml_file = Path(__file__).parent / "example.qml" - url = QUrl.fromLocalFile(qml_file) engine = QQmlEngine() - component = QQmlComponent(engine, url) + engine.addImportPath(Path(__file__).parent) + component = QQmlComponent(engine) + component.loadFromModule("People", "Main") + party = component.create() if not party: print(component.errors()) diff --git a/examples/qml/referenceexamples/grouped/person.py b/examples/qml/referenceexamples/grouped/person.py index a1edf077e..42434fffa 100644 --- a/examples/qml/referenceexamples/grouped/person.py +++ b/examples/qml/referenceexamples/grouped/person.py @@ -7,7 +7,7 @@ from PySide6.QtQml import QmlAnonymous, QmlElement # To be used on the @QmlElement decorator # (QML_IMPORT_MINOR_VERSION is optional) -QML_IMPORT_NAME = "examples.grouped.people" +QML_IMPORT_NAME = "People" QML_IMPORT_MAJOR_VERSION = 1 |