feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Fix MCUDefaultStyle usage via wizard

Browse Source 
Task-number: QDS-10420
Change-Id: Icef96452c1f7c84accc95b67f3e0b2044e8416c4
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
This commit is contained in:
Aleksei German
2023-08-28 17:25:01 +02:00
parent 6eba95d406
commit b46a0e8e1d
11 changed files with 38 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/MCUDefaultStyle/Button.qml
View File

@@ -1,8 +1,8 @@
// Copyright (C) 2022 The Qt Company Ltd. // Copyright (C) 2023 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
import QtQuick 2.15 import QtQuick
import QtQuick.Templates 2.15 as T import QtQuick.Templates as T
T.Button { T.Button {
id: control id: control

6
share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/MCUDefaultStyle/CheckBox.qml
View File

@@ -1,8 +1,8 @@
// Copyright (C) 2022 The Qt Company Ltd. // Copyright (C) 2023 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
import QtQuick 2.15 import QtQuick
import QtQuick.Templates 2.15 as T import QtQuick.Templates as T
T.CheckBox { T.CheckBox {
id: control id: control

4
share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/MCUDefaultStyle/DefaultStyle.qml
View File

@@ -1,9 +1,9 @@
// Copyright (C) 2022 The Qt Company Ltd. // Copyright (C) 2023 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
pragma Singleton pragma Singleton
import QtQuick 2.15 import QtQuick
QtObject { QtObject {
readonly property int inset: 5 readonly property int inset: 5

6
share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/MCUDefaultStyle/Dial.qml
View File

@@ -1,8 +1,8 @@
// Copyright (C) 2022 The Qt Company Ltd. // Copyright (C) 2023 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
import QtQuick 2.15 import QtQuick
import QtQuick.Templates 2.15 as T import QtQuick.Templates as T
T.Dial { T.Dial {
id: control id: control

6
share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/MCUDefaultStyle/ProgressBar.qml
View File

@@ -1,8 +1,8 @@
// Copyright (C) 2022 The Qt Company Ltd. // Copyright (C) 2023 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
import QtQuick 2.15 import QtQuick
import QtQuick.Templates 2.15 as T import QtQuick.Templates as T
T.ProgressBar { T.ProgressBar {
id: root id: root

6
share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/MCUDefaultStyle/RadioButton.qml
View File

@@ -1,8 +1,8 @@
// Copyright (C) 2022 The Qt Company Ltd. // Copyright (C) 2023 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
import QtQuick 2.15 import QtQuick
import QtQuick.Templates 2.15 as T import QtQuick.Templates as T
T.RadioButton { T.RadioButton {
id: control id: control

6
share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/MCUDefaultStyle/Slider.qml
View File

@@ -1,8 +1,8 @@
// Copyright (C) 2022 The Qt Company Ltd. // Copyright (C) 2023 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
import QtQuick 2.15 import QtQuick
import QtQuick.Templates 2.15 as T import QtQuick.Templates as T
T.Slider { T.Slider {
id: control id: control

6
share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/MCUDefaultStyle/SwipeView.qml
View File

@@ -1,8 +1,8 @@
// Copyright (C) 2022 The Qt Company Ltd. // Copyright (C) 2023 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
import QtQuick 2.15 import QtQuick
import QtQuick.Templates 2.15 as T import QtQuick.Templates as T
T.SwipeView { T.SwipeView {
id: control id: control

6
share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/MCUDefaultStyle/Switch.qml
View File

@@ -1,8 +1,8 @@
// Copyright (C) 2022 The Qt Company Ltd. // Copyright (C) 2023 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
import QtQuick 2.15 import QtQuick
import QtQuick.Templates 2.15 as T import QtQuick.Templates as T
T.Switch { T.Switch {
id: control id: control

12
share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/MCUDefaultStyle/qmldir
View File

@@ -1,2 +1,12 @@
module QtQuick.Controls.MCUDefaultStyle module QtQuick.Controls.MCUDefaultStyle
singleton DefaultStyle 1.0 DefaultStyle.qml import QtQuick.Controls.Basic auto
depends QtQuick auto
singleton DefaultStyle 6.0 DefaultStyle.qml
Button 6.0 Button.qml
CheckBox 6.0 CheckBox.qml
Dial 6.0 Dial.qml
ProgressBar 6.0 ProgressBar.qml
RadioButton 6.0 RadioButton.qml
Slider 6.0 Slider.qml
SwipeView 6.0 SwipeView.qml
Switch 6.0 Switch.qml

2
share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/wizard.json
View File

@@ -183,7 +183,7 @@
}, },
{ {
"source": "MCUDefaultStyle", "source": "MCUDefaultStyle",
"target": "%{ProjectDirectory}/MCUDefaultStyle" "target": "%{ProjectDirectory}/imports/MCUDefaultStyle"
}, },
{ {
"isBinary": true, "isBinary": true,