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/valuesource | |
| 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/valuesource')
| -rw-r--r-- | examples/qml/referenceexamples/valuesource/People/Main.qml (renamed from examples/qml/referenceexamples/valuesource/example.qml) | 2 | ||||
| -rw-r--r-- | examples/qml/referenceexamples/valuesource/People/qmldir | 3 | ||||
| -rw-r--r-- | examples/qml/referenceexamples/valuesource/birthdayparty.py | 2 | ||||
| -rw-r--r-- | examples/qml/referenceexamples/valuesource/happybirthdaysong.py | 2 | ||||
| -rw-r--r-- | examples/qml/referenceexamples/valuesource/main.py | 10 | ||||
| -rw-r--r-- | examples/qml/referenceexamples/valuesource/person.py | 2 | ||||
| -rw-r--r-- | examples/qml/referenceexamples/valuesource/valuesource.pyproject | 3 |
7 files changed, 14 insertions, 10 deletions
diff --git a/examples/qml/referenceexamples/valuesource/example.qml b/examples/qml/referenceexamples/valuesource/People/Main.qml index cb9683f3a..254265a80 100644 --- a/examples/qml/referenceexamples/valuesource/example.qml +++ b/examples/qml/referenceexamples/valuesource/People/Main.qml @@ -1,7 +1,7 @@ // Copyright (C) 2022 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -import examples.valuesource.people +import People BirthdayParty { HappyBirthdaySong on announcement { name: "Bob Jones" } diff --git a/examples/qml/referenceexamples/valuesource/People/qmldir b/examples/qml/referenceexamples/valuesource/People/qmldir new file mode 100644 index 000000000..a2bd9515a --- /dev/null +++ b/examples/qml/referenceexamples/valuesource/People/qmldir @@ -0,0 +1,3 @@ +module People +typeinfo coercion.qmltypes +Main 1.0 Main.qml diff --git a/examples/qml/referenceexamples/valuesource/birthdayparty.py b/examples/qml/referenceexamples/valuesource/birthdayparty.py index 3bc75e819..52af2fe97 100644 --- a/examples/qml/referenceexamples/valuesource/birthdayparty.py +++ b/examples/qml/referenceexamples/valuesource/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.valuesource.people" +QML_IMPORT_NAME = "People" QML_IMPORT_MAJOR_VERSION = 1 diff --git a/examples/qml/referenceexamples/valuesource/happybirthdaysong.py b/examples/qml/referenceexamples/valuesource/happybirthdaysong.py index 30aa6b59b..59ebfe4c6 100644 --- a/examples/qml/referenceexamples/valuesource/happybirthdaysong.py +++ b/examples/qml/referenceexamples/valuesource/happybirthdaysong.py @@ -6,7 +6,7 @@ from PySide6.QtQml import QmlElement, QPyQmlPropertyValueSource # To be used on the @QmlElement decorator # (QML_IMPORT_MINOR_VERSION is optional) -QML_IMPORT_NAME = "examples.valuesource.people" +QML_IMPORT_NAME = "People" QML_IMPORT_MAJOR_VERSION = 1 diff --git a/examples/qml/referenceexamples/valuesource/main.py b/examples/qml/referenceexamples/valuesource/main.py index c3ded4be9..b763a456a 100644 --- a/examples/qml/referenceexamples/valuesource/main.py +++ b/examples/qml/referenceexamples/valuesource/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/valuesource example from Qt v6.x""" +"""PySide6 port of the qml/examples/qml/tutorials/extending-qml-advanced/advanced6-Property-value-source 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, qmlAttachedPropertiesObject from person import Boy, Girl @@ -15,10 +15,10 @@ from happybirthdaysong import HappyBirthdaySong 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/valuesource/person.py b/examples/qml/referenceexamples/valuesource/person.py index 5cd04e38a..89844c87f 100644 --- a/examples/qml/referenceexamples/valuesource/person.py +++ b/examples/qml/referenceexamples/valuesource/person.py @@ -6,7 +6,7 @@ from PySide6.QtQml import QmlAnonymous, QmlElement # To be used on the @QmlElement decorator # (QML_IMPORT_MINOR_VERSION is optional) -QML_IMPORT_NAME = "examples.valuesource.people" +QML_IMPORT_NAME = "People" QML_IMPORT_MAJOR_VERSION = 1 diff --git a/examples/qml/referenceexamples/valuesource/valuesource.pyproject b/examples/qml/referenceexamples/valuesource/valuesource.pyproject index a782d5c8a..fe2980fa9 100644 --- a/examples/qml/referenceexamples/valuesource/valuesource.pyproject +++ b/examples/qml/referenceexamples/valuesource/valuesource.pyproject @@ -1,3 +1,4 @@ { - "files": ["main.py", "birthdayparty.py", "happybirthdaysong.py", "person.py", "example.qml"] + "files": ["main.py", "birthdayparty.py", "happybirthdaysong.py", "person.py", + "People/Main.qml", "People/qmldir"] } |