diff options
| author | Cristián Maureira-Fredes <Cristian.Maureira-Fredes@qt.io> | 2024-11-08 18:38:00 +0100 |
|---|---|---|
| committer | Cristián Maureira-Fredes <Cristian.Maureira-Fredes@qt.io> | 2024-11-11 16:38:50 +0100 |
| commit | 435e739df302114517f1685a5146e4741454ad9d (patch) | |
| tree | 2d180b97a719b129cf266813a7074c3c4bd3a8a7 /sources/pyside6/doc/tutorials/qmlintegration/Main | |
| parent | d500c4fcebdad5516da1ae7865d76437c752ac92 (diff) | |
doc: Avoid same name for directory and main qml file
Discovered while testing deployment on macOS,
nuitka fails when the directory and file (e.g. Main/Main.qml)
have the same name.
This might be able to be fixed by other arguments or even
upstream in Nuitka, this is a simple change that will encourage
people not to use the same name in the meantime
Pick-to: 6.8
Fixes: PYSIDE-2919
Task-number: PYSIDE-2910
Change-Id: I596d820e4a30996f9cf934a9f93e6436e51ad0d2
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
Reviewed-by: Christian Tismer <tismer@stackless.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'sources/pyside6/doc/tutorials/qmlintegration/Main')
| -rw-r--r-- | sources/pyside6/doc/tutorials/qmlintegration/Main/Main.qml | 160 | ||||
| -rw-r--r-- | sources/pyside6/doc/tutorials/qmlintegration/Main/qmldir | 2 |
2 files changed, 0 insertions, 162 deletions
diff --git a/sources/pyside6/doc/tutorials/qmlintegration/Main/Main.qml b/sources/pyside6/doc/tutorials/qmlintegration/Main/Main.qml deleted file mode 100644 index 635603fac..000000000 --- a/sources/pyside6/doc/tutorials/qmlintegration/Main/Main.qml +++ /dev/null @@ -1,160 +0,0 @@ -// Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - - -import QtQuick 2.0 -import QtQuick.Layouts 1.11 -import QtQuick.Controls 2.1 -import QtQuick.Window 2.1 -import QtQuick.Controls.Material 2.1 - -import io.qt.textproperties 1.0 - -ApplicationWindow { - id: page - width: 800 - height: 400 - visible: true - Material.theme: Material.Dark - Material.accent: Material.Red - - Bridge { - id: bridge - } - - GridLayout { - id: grid - columns: 2 - rows: 3 - - ColumnLayout { - spacing: 2 - Layout.columnSpan: 1 - Layout.preferredWidth: 400 - - Text { - id: leftlabel - Layout.alignment: Qt.AlignHCenter - color: "white" - font.pointSize: 16 - text: "Qt for Python" - Layout.preferredHeight: 100 - Material.accent: Material.Green - } - - RadioButton { - id: italic - Layout.alignment: Qt.AlignLeft - text: "Italic" - onToggled: { - leftlabel.font.italic = bridge.getItalic(italic.text) - leftlabel.font.bold = bridge.getBold(italic.text) - leftlabel.font.underline = bridge.getUnderline(italic.text) - - } - } - RadioButton { - id: bold - Layout.alignment: Qt.AlignLeft - text: "Bold" - onToggled: { - leftlabel.font.italic = bridge.getItalic(bold.text) - leftlabel.font.bold = bridge.getBold(bold.text) - leftlabel.font.underline = bridge.getUnderline(bold.text) - } - } - RadioButton { - id: underline - Layout.alignment: Qt.AlignLeft - text: "Underline" - onToggled: { - leftlabel.font.italic = bridge.getItalic(underline.text) - leftlabel.font.bold = bridge.getBold(underline.text) - leftlabel.font.underline = bridge.getUnderline(underline.text) - } - } - RadioButton { - id: noneradio - Layout.alignment: Qt.AlignLeft - text: "None" - checked: true - onToggled: { - leftlabel.font.italic = bridge.getItalic(noneradio.text) - leftlabel.font.bold = bridge.getBold(noneradio.text) - leftlabel.font.underline = bridge.getUnderline(noneradio.text) - } - } - } - - ColumnLayout { - id: rightcolumn - spacing: 2 - Layout.columnSpan: 1 - Layout.preferredWidth: 400 - Layout.preferredHeight: 400 - Layout.fillWidth: true - - RowLayout { - Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter - - - Button { - id: red - text: "Red" - highlighted: true - Material.accent: Material.Red - onClicked: { - leftlabel.color = bridge.getColor(red.text) - } - } - Button { - id: green - text: "Green" - highlighted: true - Material.accent: Material.Green - onClicked: { - leftlabel.color = bridge.getColor(green.text) - } - } - Button { - id: blue - text: "Blue" - highlighted: true - Material.accent: Material.Blue - onClicked: { - leftlabel.color = bridge.getColor(blue.text) - } - } - Button { - id: nonebutton - text: "None" - highlighted: true - Material.accent: Material.BlueGrey - onClicked: { - leftlabel.color = bridge.getColor(nonebutton.text) - } - } - } - RowLayout { - Layout.fillWidth: true - Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter - Text { - id: rightlabel - color: "white" - Layout.alignment: Qt.AlignLeft - text: "Font size" - Material.accent: Material.White - } - Slider { - width: rightcolumn.width*0.6 - Layout.alignment: Qt.AlignRight - id: slider - value: 0.5 - onValueChanged: { - leftlabel.font.pointSize = bridge.getSize(value) - } - } - } - } - } -} diff --git a/sources/pyside6/doc/tutorials/qmlintegration/Main/qmldir b/sources/pyside6/doc/tutorials/qmlintegration/Main/qmldir deleted file mode 100644 index 8ad738e16..000000000 --- a/sources/pyside6/doc/tutorials/qmlintegration/Main/qmldir +++ /dev/null @@ -1,2 +0,0 @@ -module Main -Main 254.0 Main.qml |