diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-02-10 14:05:29 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-02-10 16:22:59 +0000 |
| commit | 729a09a6d6016381d5ab065fe07f4330121fda55 (patch) | |
| tree | 31844776d82ff1bea6ac4ba25bdd29c4a29c6de3 | |
| parent | 52de54ebc3e8f8a09b826cfee3f6ca84290de9ff (diff) | |
PySide6: Add the logo as a resource to libpyside
Use it in prominent examples.
Change-Id: Ifee67802194931bbd56fbe6e6bfa4f3c18fda781
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
(cherry picked from commit ac7365aa78d78a3693c46e2177df3216d0a40628)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | examples/quickcontrols2/gallery/gallery.py | 6 | ||||
| -rw-r--r-- | examples/widgets/gallery/widgetgallery.py | 1 | ||||
| -rw-r--r-- | sources/pyside6/libpyside/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | sources/pyside6/libpyside/libpyside.qrc | 5 |
4 files changed, 13 insertions, 1 deletions
diff --git a/examples/quickcontrols2/gallery/gallery.py b/examples/quickcontrols2/gallery/gallery.py index 69755f2b0..2b3453395 100644 --- a/examples/quickcontrols2/gallery/gallery.py +++ b/examples/quickcontrols2/gallery/gallery.py @@ -87,7 +87,11 @@ if __name__ == "__main__": engine.rootContext().setContextProperty("builtInStyles", built_in_styles) engine.load(":/gallery.qml") - if not engine.rootObjects(): + rootObjects = engine.rootObjects() + if not rootObjects: sys.exit(-1) + window = rootObjects[0] + window.setIcon(QIcon(':/qt-project.org/logos/pysidelogo.png')) + sys.exit(app.exec_()) diff --git a/examples/widgets/gallery/widgetgallery.py b/examples/widgets/gallery/widgetgallery.py index fd7c3246e..3ea21888e 100644 --- a/examples/widgets/gallery/widgetgallery.py +++ b/examples/widgets/gallery/widgetgallery.py @@ -149,6 +149,7 @@ class WidgetGallery(QDialog): def __init__(self): super(WidgetGallery, self).__init__() + self.setWindowIcon(QIcon(':/qt-project.org/logos/pysidelogo.png')) self._progress_bar = self.create_progress_bar() self._style_combobox = QComboBox() diff --git a/sources/pyside6/libpyside/CMakeLists.txt b/sources/pyside6/libpyside/CMakeLists.txt index 33e23063b..50cc3108f 100644 --- a/sources/pyside6/libpyside/CMakeLists.txt +++ b/sources/pyside6/libpyside/CMakeLists.txt @@ -56,6 +56,8 @@ set(libpyside_SRC pysidestaticstrings.cpp ) +qt6_add_resources(libpyside_SRC libpyside.qrc) + # Add python files to project explorer in Qt Creator, when opening the CMakeLists.txt as a project, # so you can look up python files with the Locator. macro(add_other_files) diff --git a/sources/pyside6/libpyside/libpyside.qrc b/sources/pyside6/libpyside/libpyside.qrc new file mode 100644 index 000000000..927c676a7 --- /dev/null +++ b/sources/pyside6/libpyside/libpyside.qrc @@ -0,0 +1,5 @@ +<RCC> + <qresource prefix="/qt-project.org/logos"> + <file alias="pysidelogo.png">../doc/_themes/pysidedocs/static/pysidelogo.png</file> + </qresource> +</RCC> |