3 files changed, 25 insertions, 83 deletions
diff --git a/examples/quick/painteditem/doc/painteditem.rst b/examples/quick/painteditem/doc/painteditem.rst
index 6f12355ca..5c3e8935b 100644
--- a/examples/quick/painteditem/doc/painteditem.rst
+++ b/examples/quick/painteditem/doc/painteditem.rst
@@ -1,6 +1,8 @@
 Scene Graph Painted Item Example
 ================================
 
+.. tags:: Android
+
 Shows how to implement QPainter-based custom scenegraph items.
 
 The Painted Item example shows how to use the QML Scene Graph framework to
diff --git a/examples/quick/painteditem/main.qml b/examples/quick/painteditem/main.qml
index 182fdc986..44be89dc3 100644
--- a/examples/quick/painteditem/main.qml
+++ b/examples/quick/painteditem/main.qml
@@ -1,42 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2020 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the Qt for Python examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2020 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 import QtQuick
 import TextBalloonPlugin
@@ -62,7 +25,7 @@ Item {
         anchors.top: parent.top
         id: balloonView
         delegate: TextBalloon {
-            anchors.right: index % 2 == 0 ? undefined : parent.right
+            anchors.right: index % 2 == 0 ? undefined : balloonView.contentItem.right
             height: 60
             rightAligned: index % 2 == 0 ? false : true
             width: balloonWidth
diff --git a/examples/quick/painteditem/painteditem.py b/examples/quick/painteditem/painteditem.py
index ff744063a..cf5a05ada 100644
--- a/examples/quick/painteditem/painteditem.py
+++ b/examples/quick/painteditem/painteditem.py
@@ -1,52 +1,22 @@
-#############################################################################
-##
-## Copyright (C) 2020 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the Qt for Python examples of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:BSD$
-## You may use this file under the terms of the BSD license as follows:
-##
-## "Redistribution and use in source and binary forms, with or without
-## modification, are permitted provided that the following conditions are
-## met:
-##   * Redistributions of source code must retain the above copyright
-##     notice, this list of conditions and the following disclaimer.
-##   * Redistributions in binary form must reproduce the above copyright
-##     notice, this list of conditions and the following disclaimer in
-##     the documentation and/or other materials provided with the
-##     distribution.
-##   * Neither the name of The Qt Company Ltd nor the names of its
-##     contributors may be used to endorse or promote products derived
-##     from this software without specific prior written permission.
-##
-##
-## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-## "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-## LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-## A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-## OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-## DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
+from argparse import ArgumentParser, RawTextHelpFormatter
+from pathlib import Path
 import sys
 
 from PySide6.QtGui import QPainter, QBrush, QColor
 from PySide6.QtWidgets import QApplication
-from PySide6.QtQml import qmlRegisterType
+from PySide6.QtQml import QmlElement, QQmlDebuggingEnabler
 from PySide6.QtCore import QUrl, Property, Signal, Qt, QPointF
 from PySide6.QtQuick import QQuickPaintedItem, QQuickView
 
+QML_IMPORT_NAME = "TextBalloonPlugin"
+QML_IMPORT_MAJOR_VERSION = 1
+QML_IMPORT_MINOR_VERSION = 0  # Optional
 
+
+@QmlElement
 class TextBalloon(QQuickPaintedItem):
 
     rightAlignedChanged = Signal()
@@ -60,7 +30,7 @@ class TextBalloon(QQuickPaintedItem):
         return self._rightAligned
 
     @rightAligned.setter
-    def rightAlignedSet(self, value):
+    def rightAligned(self, value):
         self._rightAligned = value
         self.rightAlignedChanged.emit()
 
@@ -93,11 +63,18 @@ class TextBalloon(QQuickPaintedItem):
 
 if __name__ == "__main__":
 
+    argument_parser = ArgumentParser(description="Scene Graph Painted Item Example",
+                                     formatter_class=RawTextHelpFormatter)
+    argument_parser.add_argument("-qmljsdebugger", action="store",
+                                 help="Enable QML debugging")
+    options = argument_parser.parse_args()
+    if options.qmljsdebugger:
+        QQmlDebuggingEnabler.enableDebugging(True)
     app = QApplication(sys.argv)
     view = QQuickView()
     view.setResizeMode(QQuickView.SizeRootObjectToView)
-    qmlRegisterType(TextBalloon, "TextBalloonPlugin", 1, 0, "TextBalloon")
-    view.setSource(QUrl.fromLocalFile("main.qml"))
+    qml_file = Path(__file__).parent / "main.qml"
+    view.setSource(QUrl.fromLocalFile(qml_file))
 
     if view.status() == QQuickView.Error:
         sys.exit(-1)