qiurui
/
qtdoc
mirror of https://github.com/qt/qtdoc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Thermostat: Use QtQuickControls.Basic 

The example uses custom controls for its UI so we can safely use a
a style that the compiler can deal with.

Task-number: QTBUG-138188
Pick-to: 6.10
Change-Id: I66bcad7a78e06ab9d3e28b4ba238fec42dd9c81b
Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
Olivier De Cannière 2025-08-04 15:12:15 +02:00
parent 8324d68486
commit 30dc679c9a
39 changed files with 35 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/demos/thermostat/CMakeLists.txt
View File

@ -11,12 +11,6 @@ qt_standard_project_setup(REQUIRES 6.8)
qt_add_executable(ThermostatApp src/main.cpp)
qt_add_resources(ThermostatApp "configuration"
PREFIX "/"
FILES
qtquickcontrols2.conf
)
include(qmlmodules)
target_link_libraries(ThermostatApp PRIVATE

6
examples/demos/thermostat/Thermostat.qmlproject
View File

@ -25,11 +25,6 @@ Project {
directory: "content"
}
Files {
filter: "*.conf"
files: ["qtquickcontrols2.conf"]
}
Files {
filter: "qmldir"
directory: "."
@ -61,7 +56,6 @@ Project {
}
Environment {
QT_QUICK_CONTROLS_CONF: "qtquickcontrols2.conf"
QML_COMPAT_RESOLVE_URLS_ON_ASSIGNMENT: "1"
}

2
examples/demos/thermostat/content/BottomBarForm.ui.qml
View File

@ -9,7 +9,7 @@ this file manually, you might introduce QML code that is not supported by Qt Des
Check out https://doc.qt.io/qtcreator/creator-quick-ui-forms.html for details on .ui.qml files.
*/
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Basic
import Thermostat
TabBar {

2
examples/demos/thermostat/content/HomePageForm.ui.qml
View File

@ -9,7 +9,7 @@ this file manually, you might introduce QML code that is not supported by Qt Des
Check out https://doc.qt.io/qtcreator/creator-quick-ui-forms.html for details on .ui.qml files.
*/
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Basic
import QtQuick.Layouts
import Thermostat

2
examples/demos/thermostat/content/RoomItemForm.ui.qml
View File

@ -9,7 +9,7 @@ this file manually, you might introduce QML code that is not supported by Qt Des
Check out https://doc.qt.io/qtcreator/creator-quick-ui-forms.html for details on .ui.qml files.
*/
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Basic
import QtQuick.Layouts
import QtQuick.Effects
import ThermostatCustomControls

2
examples/demos/thermostat/content/RoomOptionForm.ui.qml
View File

@ -9,7 +9,7 @@ this file manually, you might introduce QML code that is not supported by Qt Des
Check out https://doc.qt.io/qtcreator/creator-quick-ui-forms.html for details on .ui.qml files.
*/
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Basic
import Thermostat
Button {

2
examples/demos/thermostat/content/RoomsScrollViewForm.ui.qml
View File

@ -9,7 +9,7 @@ this file manually, you might introduce QML code that is not supported by Qt Des
Check out https://doc.qt.io/qtcreator/creator-quick-ui-forms.html for details on .ui.qml files.
*/
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Basic
import QtQuick.Layouts
ScrollView {

2
examples/demos/thermostat/content/RoomsSwipeViewForm.ui.qml
View File

@ -9,7 +9,7 @@ this file manually, you might introduce QML code that is not supported by Qt Des
Check out https://doc.qt.io/qtcreator/creator-quick-ui-forms.html for details on .ui.qml files.
*/
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Basic
Item {
id: root

2
examples/demos/thermostat/content/RoomsViewForm.ui.qml
View File

@ -9,7 +9,7 @@ this file manually, you might introduce QML code that is not supported by Qt Des
Check out https://doc.qt.io/qtcreator/creator-quick-ui-forms.html for details on .ui.qml files.
*/
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Basic
import Thermostat
Pane {

2
examples/demos/thermostat/content/ScheduleScrollViewForm.ui.qml
View File

@ -8,7 +8,7 @@ this file manually, you might introduce QML code that is not supported by Qt Des
Check out https://doc.qt.io/qtcreator/creator-quick-ui-forms.html for details on .ui.qml files.
*/
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Basic
import QtQuick.Layouts
import Thermostat

2
examples/demos/thermostat/content/ScheduleSwipeViewForm.ui.qml
View File

@ -9,7 +9,7 @@ this file manually, you might introduce QML code that is not supported by Qt Des
Check out https://doc.qt.io/qtcreator/creator-quick-ui-forms.html for details on .ui.qml files.
*/
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Basic
Item {
id: root

2
examples/demos/thermostat/content/ScheduleViewForm.ui.qml
View File

@ -9,7 +9,7 @@ this file manually, you might introduce QML code that is not supported by Qt Des
Check out https://doc.qt.io/qtcreator/creator-quick-ui-forms.html for details on .ui.qml files.
*/
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Basic
import QtQuick.Layouts
import Thermostat
import ThermostatCustomControls

2
examples/demos/thermostat/content/SideBarForm.ui.qml
View File

@ -9,7 +9,7 @@ this file manually, you might introduce QML code that is not supported by Qt Des
Check out https://doc.qt.io/qtcreator/creator-quick-ui-forms.html for details on .ui.qml files.
*/
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Basic
import QtQuick.Layouts
import QtQuick.Effects
import Thermostat

2
examples/demos/thermostat/content/StatisticsScrollViewForm.ui.qml
View File

@ -9,7 +9,7 @@ this file manually, you might introduce QML code that is not supported by Qt Des
Check out https://doc.qt.io/qtcreator/creator-quick-ui-forms.html for details on .ui.qml files.
*/
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Basic
import QtQuick.Layouts
import ThermostatCustomControls
import Thermostat

2
examples/demos/thermostat/content/StatisticsSwipeViewForm.ui.qml
View File

@ -9,7 +9,7 @@ this file manually, you might introduce QML code that is not supported by Qt Des
Check out https://doc.qt.io/qtcreator/creator-quick-ui-forms.html for details on .ui.qml files.
*/
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Basic
Item {
id: root

2
examples/demos/thermostat/content/StatisticsViewForm.ui.qml
View File

@ -9,7 +9,7 @@ this file manually, you might introduce QML code that is not supported by Qt Des
Check out https://doc.qt.io/qtcreator/creator-quick-ui-forms.html for details on .ui.qml files.
*/
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Basic
import QtQuick.Layouts
import Thermostat
import ThermostatCustomControls

2
examples/demos/thermostat/content/TemperatureSetterDesktopViewForm.ui.qml
View File

@ -8,7 +8,7 @@ this file manually, you might introduce QML code that is not supported by Qt Des
Check out https://doc.qt.io/qtcreator/creator-quick-ui-forms.html for details on .ui.qml files.
*/
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Basic
import QtQuick.Layouts
import QtQuick.Effects
import Thermostat

2
examples/demos/thermostat/content/TemperatureSetterForm.ui.qml
View File

@ -8,7 +8,7 @@ this file manually, you might introduce QML code that is not supported by Qt Des
Check out https://doc.qt.io/qtcreator/creator-quick-ui-forms.html for details on .ui.qml files.
*/
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Basic
import QtQuick.Layouts
import Thermostat
import ThermostatCustomControls

2
examples/demos/thermostat/content/TemperatureSetterMobileViewForm.ui.qml
View File

@ -9,7 +9,7 @@ this file manually, you might introduce QML code that is not supported by Qt Des
Check out https://doc.qt.io/qtcreator/creator-quick-ui-forms.html for details on .ui.qml files.
*/
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Basic
import QtQuick.Layouts
import QtQuick.Effects
import Thermostat

2
examples/demos/thermostat/content/TemperatureSetterSmallViewForm.ui.qml
View File

@ -9,7 +9,7 @@ this file manually, you might introduce QML code that is not supported by Qt Des
Check out https://doc.qt.io/qtcreator/creator-quick-ui-forms.html for details on .ui.qml files.
*/
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Basic
import QtQuick.Layouts
import QtQuick.Effects
import Thermostat

2
examples/demos/thermostat/content/ThermostatInfoForm.ui.qml
View File

@ -9,7 +9,7 @@ this file manually, you might introduce QML code that is not supported by Qt Des
Check out https://doc.qt.io/qtcreator/creator-quick-ui-forms.html for details on .ui.qml files.
*/
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Basic
import QtQuick.Layouts
import QtQuick.Effects
import Thermostat

2
examples/demos/thermostat/content/ThermostatScrollViewForm.ui.qml
View File

@ -9,7 +9,7 @@ this file manually, you might introduce QML code that is not supported by Qt Des
Check out https://doc.qt.io/qtcreator/creator-quick-ui-forms.html for details on .ui.qml files.
*/
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Basic
import QtQuick.Layouts
import Thermostat

2
examples/demos/thermostat/content/ThermostatSettingsForm.ui.qml
View File

@ -9,7 +9,7 @@ this file manually, you might introduce QML code that is not supported by Qt Des
Check out https://doc.qt.io/qtcreator/creator-quick-ui-forms.html for details on .ui.qml files.
*/
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Basic
import QtQuick.Effects
import ThermostatCustomControls
import Thermostat

2
examples/demos/thermostat/content/ThermostatSwipeViewForm.ui.qml
View File

@ -8,7 +8,7 @@ this file manually, you might introduce QML code that is not supported by Qt Des
Check out https://doc.qt.io/qtcreator/creator-quick-ui-forms.html for details on .ui.qml files.
*/
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Basic
Item {
id: root

2
examples/demos/thermostat/content/ThermostatViewForm.ui.qml
View File

@ -9,7 +9,7 @@ this file manually, you might introduce QML code that is not supported by Qt Des
Check out https://doc.qt.io/qtcreator/creator-quick-ui-forms.html for details on .ui.qml files.
*/
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Basic
import QtQuick.Layouts
import Thermostat
import ThermostatCustomControls

2
examples/demos/thermostat/content/TimeScheduleForm.ui.qml
View File

@ -9,7 +9,7 @@ this file manually, you might introduce QML code that is not supported by Qt Des
Check out https://doc.qt.io/qtcreator/creator-quick-ui-forms.html for details on .ui.qml files.
*/
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Basic
import QtQuick.Layouts
import Thermostat
import ThermostatCustomControls

2
examples/demos/thermostat/imports/ThermostatCustomControls/CustomComboBox.qml
View File

@ -4,7 +4,7 @@
pragma ComponentBehavior: Bound
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Basic
import Thermostat
ComboBox {

2
examples/demos/thermostat/imports/ThermostatCustomControls/CustomDial.qml
View File

@ -2,7 +2,7 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Basic
import QtQuick.Shapes
import Thermostat

2
examples/demos/thermostat/imports/ThermostatCustomControls/CustomRadioButton.qml
View File

@ -1,7 +1,7 @@
// Copyright (C) 2023 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Basic
import Thermostat
RadioButton {

2
examples/demos/thermostat/imports/ThermostatCustomControls/CustomRoundButton.qml
View File

@ -2,7 +2,7 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Basic
import Thermostat
RoundButton {

2
examples/demos/thermostat/imports/ThermostatCustomControls/CustomSlider.qml
View File

@ -2,7 +2,7 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Basic
import QtQuick.Effects
import Thermostat

2
examples/demos/thermostat/imports/ThermostatCustomControls/CustomSwitch.qml
View File

@ -2,7 +2,7 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Basic
import Thermostat
Switch {

2
examples/demos/thermostat/imports/ThermostatCustomControls/CustomTextField.qml
View File

@ -2,7 +2,7 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Basic
import Thermostat
TextField {

2
examples/demos/thermostat/imports/ThermostatCustomControls/StatisticsChart.qml
View File

@ -2,7 +2,7 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Basic
import QtCharts
import Thermostat

2
examples/demos/thermostat/imports/ThermostatCustomControls/TemperatureLabel.qml
View File

@ -2,7 +2,7 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Basic
import QtQuick.Effects
import Thermostat

2
examples/demos/thermostat/imports/ThermostatCustomControls/ThermostatControl.qml
View File

@ -4,7 +4,7 @@
pragma ComponentBehavior: Bound
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Basic
import Thermostat
Pane {

2
examples/demos/thermostat/imports/ThermostatCustomControls/TimeSelector.qml
View File

@ -4,7 +4,7 @@
pragma ComponentBehavior: Bound
import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Basic
import Thermostat
Rectangle {

2
examples/demos/thermostat/qtquickcontrols2.conf
View File

@ -1,2 +0,0 @@
[Controls]
Style=Basic

2
examples/demos/thermostat/src/app_environment.h
View File

@ -6,6 +6,4 @@
void set_qt_environment()
{
qputenv("QML_COMPAT_RESOLVE_URLS_ON_ASSIGNMENT", "1");
qputenv("QT_QUICK_CONTROLS_CONF", ":/qtquickcontrols2.conf");
}