| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
It caused:
File "tools/example_gallery/main.py", line 298, in <module>
content_f += get_code_tabs(pyproject["files"], out_f)
KeyError: 'files'
Amends b9ec49942b3ad53343317e631320c58e59736c22.
As a drive-by, handle the error in the gallery tool.
Change-Id: Ideca9ccb72021780cf8ae7b3f2204733cc2f5e4f
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
(cherry picked from commit 49353faf76fd8d9a26e6304a5816ccc026c5f9a1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Adding the module that contains a few C++ classes.
Adding the 'intro' example.
Adding the 'customgeometry' example as well.
Fixes: PYSIDE-1708
Change-Id: I0681f087e74c13c024bb1dfa8de545b30f95d7d8
Reviewed-by: Christian Tismer <tismer@stackless.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit b9ec49942b3ad53343317e631320c58e59736c22)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
| |
This is motivated by the deprecation of distutils,
and removal in future versions
https://github.com/pypa/packaging-problems/issues/127
Change-Id: I16448b69f98df6dc1d9a904b69eb69ed5f1093f5
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit 95a5bb9dd3b5d3fa86f2ed0868e2b821256a6028)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Fix the example comment
- Use Property decorator
- Use leading underscore for private member variables
- Streamline the code a bit.
Amends ea3851cdaf7f13f62fe9ae23b96750cd70468294.
Task-number: PYSIDE-841
Change-Id: I66843d692a4fa6d0db7da2468ed4358ec48bcd8b
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit 4750567706f0e993ca5637071815bfee9841e13b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
| |
Move the lighting example to its own directory.
Task-number: PYSIDE-841
Change-Id: I98b197994eb7f4cd592ce3af81c82d233fab9293
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit f680ebe731c447010f91393f1d35719e1596b48b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
| |
Amends ea3851cdaf7f13f62fe9ae23b96750cd70468294.
Task-number: PYSIDE-841
Change-Id: Ifb022247e6867ce3e84b1b053e139125e984e4b5
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit b70f82fdf4a733448003ff692f2cbce149d275af)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Some platforms like Homebrew's macOS name the Python interpreter
"python3", while others use "python" as the default name.
In any case, it is correct to use the Python 3 version as
default, because Python 2 is deprecated.
The default now tries "python3" first and falls back to "python".
Task-number: PYSIDE-1710
Change-Id: I8850b2c157d219e7785177f41425dca1c2144f99
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit a77c08a6512b079175d08ae1732b9f65c79b687f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
| |
Ported from C++
Change-Id: Id18068e36ecfa26ab0312cfde2de1ba1c0773223
Task-number: PYSIDE-841
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit ea3851cdaf7f13f62fe9ae23b96750cd70468294)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Use suffix-less RHI constants (see
23dbe3d6e0d3338812ad9f614028a6fdc5a54090).
- Remove unneeded assignments
- Add slot decorator
- Streamline code
Amends b31f0c37bdc78e939db2dfe3bd876eba47137a5c.
Fixes: PYSIDE-1716
Task-number: PYSIDE-1034
Change-Id: Ib34be3642d3c2b5f3582889bdc5f0d8d7cebe007
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit e062c9d70b5560beccb696aa13d8d44e5a2332f8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
| |
- Remove * imports
- Pass signals instead of strings (SIGNAL)
- Break lines
Change-Id: I566f69210821f73dd22d351926a27638e1fc5671
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit f160c0f1f2053029c118eb5818074f875a3776b4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
| |
Change-Id: I00db0a8e8668678d5e11a1c469ec658d4a9e0a75
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit 50adf7beaae1202bc0f462bd1ee0294c5d19440a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
| |
Task-number: PYSIDE-841
Change-Id: I465f9e92b5fca2b6e7e261d1976082e834af528b
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
(cherry picked from commit c9ba44deb48a064eec9229b5426187611c7d592a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
| |
Task-number: PYSIDE-841
Change-Id: I99a592e6a9c347c46dd9bb86a9e925d0f70c34c6
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
(cherry picked from commit 5b8d4517fabda5713a4023b9692ff5fe77162237)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
| |
Task-number: PYSIDE-841
Change-Id: Iff14a58f065070ef3ffe409bb1516bd4ed30dac7
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
(cherry picked from commit 20fee1eb56f64ecc6d356abe658da14d09e7d09a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
| |
Ported from c++.
Task-number: PYSIDE-841
Change-Id: Ie7fc583913727ecf1838bc31b79da3ccc293fea2
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
(cherry picked from commit 45a0645901a839a1472588a3cbda4fd290cc556a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fix warnings:
sources/pyside6/doc/examples/example_declarative_referenceexamples_properties.rst:17: WARNING: Pygments lexer name 'javascript:' is not known
sources/pyside6/doc/examples/example_declarative_referenceexamples_properties.rst:36: WARNING: Pygments lexer name 'python:' is not k
Amends e057d9f4cbfd97e5fc0bdec564f63fabe5b50189.
Task-number: PYSIDE-841
Change-Id: I358238f5152c1980c6c12a80b3caf76304f29e8e
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit 269ce1dfee061443e319e7f78e6fc6a9d7a77275)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
| |
Task-number: PYSIDE-841
Change-Id: I6565bdbbc4ea401c027f6aab41598df48c779799
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
(cherry picked from commit e057d9f4cbfd97e5fc0bdec564f63fabe5b50189)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
In the TicTacToe game, consecutive states in different rows did
incorrectly draw an horizontal line. Fix by letting the loop operate
in steps of 3 as in the C++ example.
Fixes: PYSIDE-1701
Change-Id: I325ece1d262510167d1182636814ff8d7aa85a3d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit 07f9b2b674aca4f1d7b5f81ce25e1db08b165249)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
| |
Translated relational table model example from C++ using population data instead employee data
Task-number: PYSIDE-841
Change-Id: I493a7106275609edefdc4e140c9c9cc667a9c10f
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
(cherry picked from commit 6a9acbf1e94402161765e18e48f243b459379e77)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
| |
Ported from C++.
Task-number: PYSIDE-841
Change-Id: I60eea347586a66e69ff83ec3e2b275c053deafca
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
(cherry picked from commit 702f622a652830db18651a33da2f218c4db8f73c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
| |
Task-number: PYSIDE-841
Task-number: PYSIDE-1690
Change-Id: I6b3d774b4c136af2b71251e0b8aafa6f12ba39a2
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
(cherry picked from commit 8ddd960505308fc829ba17029b6917814f257b65)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
| |
Other minor improvements
Change-Id: I1a09b6ea813713f53c26f7244f2d913cc73c6c5b
Task-number: PYSIDE-841
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit 2bcc7ceb19b4042ae3fe320c53e1c21fd765b16a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
| |
Ported from c++
Change-Id: I3589a66f8335e808bcc81796fa4aa3e2401b5973
Task-number: PYSIDE-841
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit 6d1ceff3c070bf15736b7c389944e326e4972fbd)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
| |
Task-number: PYSIDE-841
Change-Id: I432498ff85d346def9604a551fddddb0a0939b25
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit ba1bb6785ba2d3b4569b7bce4c98ed07f73bb1b8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
| |
Areachart example translation from C++ to Python
Task-number: PYSIDE-841
Change-Id: I84af72428279efd6544667d40dc5908e0a1a463f
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
(cherry picked from commit ab49f4f58374654ff38eb618218572ba7b89e507)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
| |
Barchart example translation from C++ to Python
Task-number: PYSIDE-841
Change-Id: Ia705295f6f8c59ec9b94bc394cc1d45f35554bdf
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
(cherry picked from commit d5a74cb7be21dc6e836e53d7eaa3ee95595af676)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
| |
Task-number: PYSIDE-841
Change-Id: I274039d0642a84f526008c8ecc27f2727c84a3cd
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit e904491d87e9b91458d91d3d4e6f5d7c95127028)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
| |
Use QUrl.fromLocalFile() for the QML file.
Change-Id: I9433e3ae5c26e9db24d2b8ee4984e948fefa9aef
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
(cherry picked from commit 2e291350fd6294912bf29680a76819400ad693b7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I97166f7e89c0365f425d1f8b0b840b7ef066d0d7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Add a class that directly wraps a C++ sequence container,
allow for modifying them.
For all instantiated containers, generate a special (sequence) type
that wraps the C++ container directly. For example, it will be
accessible as a QList_int.
This is achieved via providing a template for a type private
that relies on a conversion traits template for conversion.
Only the conversion traits specialization code needs to be generated.
Use cases:
- Allowing for modifying Fields of such container types
(non-owning)
- Pass it into functions taking such containers instead of converting
back and forth from a PyList (constructed in Python, owning)
[ChangeLog][shiboken6] Support for opaque C++ sequence scontainers
has been added, allowing to pass a wrapped C++ container
directly instead of converting it back and forth from
Python sequences.
Task-number: PYSIDE-1605
Change-Id: I49d378eb1a0151730d817d5bdd4b71a7c3b5cdda
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
Interactive example to add, remove and move elements inside
a ListView (QML) from a QAbstractListModel (Python).
A screenshot is included.
Task-number: PYSIDE-841
Change-Id: I1c4d7868860c7482930fbb729cb4c2b503c01d88
Reviewed-by: Christian Tismer <tismer@stackless.com>
|
|
|
|
|
|
| |
Task-number: PYSIDE-841
Change-Id: Ia98aab49cff5fb86078b547a99b33a4a0bf8790e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
|
|
|
| |
This is example is based on the Qt's scene graph example
that uses and OpenGL animation inside Qml code.
Fixes: PYSIDE-1034
Change-Id: I012818d81d757571a711fcea68df51fa566ae5f9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
|
| |
Task-number: PYSIDE-1663
Task-number: PYSIDE-841
Change-Id: I921008a51c074ee01a937df309573067f2272f16
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
|
|
|
|
|
|
|
| |
Use the Path mechanism to resolve the QML file.
Task-number: PYSIDE-1662
Change-Id: I2d6cce02063fab6746d2cdbc7c8c8701fad7e937
Reviewed-by: Christian Tismer <tismer@stackless.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Fix the rightAligned property setter to have the same name as
the getter
- Fix the anchor property of the delegate
Fixes warnings
examples/quick/painteditem/main.qml:102:TypeError: 'NoneType' object is not callable
examples/quick/painteditem/main.qml:65: TypeError: Cannot read property 'right' of null
Pick-to: 6.1
Fixes: PYSIDE-1662
Change-Id: Iebd7a9632954fcc2b48e8a56f6e1c20d62b34468
Reviewed-by: Christian Tismer <tismer@stackless.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
SbkObjectType was a struct embedding a PyTypeObject
after fec1611e9f42c1f0a13eb33474df2ed8ee480842.
Remove that and make the types equvivalent, which allows for
removing many reinterpret_casts.
SbkObjectType is left as a typedef for client code snippets.
[ChangeLog][shiboken6] SbkObjectType is now a typedef for PyTypeObject.
Task-number: PYSIDE-535
Change-Id: I44812311ccbbe0988c38e34c47d16f6874f8d1cf
Reviewed-by: Christian Tismer <tismer@stackless.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Creating screenshots for tutorials.
- Add gallery style for tutorials.
- Add corporate Icons to the frontpage.
- tools: Reduce example long names in the gallery.
- videos: new order using panels
- Add tutorial about "Why Qt for Python"
Change-Id: I3ba50f74998399a47b4a34c1de029f3b746aa1e2
Reviewed-by: Christian Tismer <tismer@stackless.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|
|
|
|
|
|
| |
Remove deprecated API.
Change-Id: I7947554bfc582585f93973f25678b570f80c9f6a
Reviewed-by: Christian Tismer <tismer@stackless.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This proposal was discussed.
It was also tested with Nuitka and cx_freeze.
[ChangeLog][shiboken6] Python support files are now always
embedded. There is no longer a physical copy installed in the FS.
Reasoning is: We always had the signature module in real
Python files and also as an embedded ZIP file.
With the solution to PYSIDE-1621 we suddenly had a way
to avoid accessing the file system completely. The
remaining question is: Why should we keep the files in
the installation at all?
Long time ago, it was said that the source files were
needed to see tracebacks. But tracebacks are visible the
same way, regardless if the files exist as physical files
or only in memory. The error messages will be as verbose
as always.
Personally, I see it more as a drawback, because parts of
our application become vulnerable by external manipulation.
By the complete virtualization, the system is as
self-contained as a binary executable.
Task-number: PYSIDE-1621
Change-Id: I821545fb5d52465b69bb2c172bdfb43894ac2109
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
In Qt6 the latest version is used by default.
Task-number: QTBUG-82922
Task-number: PYSIDE-841
Change-Id: I71ce9caf58db24b47736b977b461324788b93423
Reviewed-by: Christian Tismer <tismer@stackless.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Keith Kyzivat <keith.kyzivat@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Most of the qml code in the repository was outdated,
and followed bad practices, like context properties.
Complementary, after the major updates for Qt6
most of the code was not relying on the new ways of
register types (singletons, and using the decorator QmlElement).
Drop the context property usage in the following examples:
- signals/qmltopy1
- signals/qmltopy2
- signals/pytoqml2
- usingmodel
- quickcontrols2/gallery
- textproperties
Additionally:
- all the tests related to context properties
- tutorials/qmlapp
- tutorials/qmlsqlintegration
- Removing 'scrolling' example
- Fixing some flake8 warnings
Change-Id: I649248c0149876bf2bf94e78e27cef7110f42f1d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Keith Kyzivat <keith.kyzivat@qt.io>
|
|
|
|
|
|
|
| |
Task-number: PYSIDE-841
Change-Id: Iec9843e0aff8fc02107c7899a0e56f067c5a6936
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Keith Kyzivat <keith.kyzivat@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
Ported redditclient example.
[ChangeLog][PySide6] The QtNetworkAuth module has been added.
Task-number: PYSIDE-1570
Change-Id: I8a057870bf5a59cab227c271c412eb5b9ec4a7b8
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- List Names example ported.
- pingpong example ported.
[ChangeLog][PySide6] The QtDBus module has been added.
Task-number: PYSIDE-1570
Done-with: Friedemann Kleint <Friedemann.Kleint@qt.io>
Change-Id: I8500662fe51754bedf63b7b3b3c3d5ef4890a755
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
|
|
|
|
|
|
|
| |
Amends 1cbec5c4a99e80819df54a4dc97091050d55b345.
Task-number: PYSIDE-1252
Change-Id: I1c516e6c596191756f37287a802178cc3a32e244
Reviewed-by: Christian Tismer <tismer@stackless.com>
|
|
|
|
|
|
|
|
| |
Add an example and a tutorial section.
Task-number: PYSIDE-1252
Change-Id: Ib0f1399abe9b0eb832c0202f54cb83dfad870d17
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Wherever possible/useful, os.fspath was removed and the
according pathlike modification inserted. This is still
not the awaited end of the conversion, but a good step
forward.
Task-number: PYSIDE-1499
Pick-to: 6.1
Change-Id: I0a22ddeec06ada05dc4a97ed104d06f5f1bbf472
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
| |
Task-number: PYSIDE-1570
Change-Id: Ic10a8f29439d5171487dfa5954c3b37be116a2b3
Reviewed-by: Christian Tismer <tismer@stackless.com>
|
|
|
|
|
|
|
|
|
| |
Add a small example along with a German translation using gettext.
Add a tutorial.
Pick-to: 6.1
Change-Id: I254a5a66521ecc2827a5811469d9d21360f99b81
Reviewed-by: Christian Tismer <tismer@stackless.com>
|