summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKamil Hajdukiewicz <kaj@spyro-soft.com>2023-06-21 11:19:22 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2023-06-21 11:36:13 +0000
commit0a06dac2fddf69e2940e8e0725b2f52ea9c4757a (patch)
tree85100e3f2b04227a5568946a91e834cfe18a50e1
parente57e3073fc304b4335747b41871f13c73e5112cb (diff)
Rename CustomControls module in thermostat example
The name of the module is changed from CustomControls to ThermostatCustomControls due build errors. Fixes: QTBUG-114759 Change-Id: I86cf9830700b867a4a690d0f41841417bfa1efc1 Reviewed-by: Kimmo Leppälä <kimmo.leppala@qt.io> Reviewed-by: Axel Spoerl <axel.spoerl@qt.io> Reviewed-by: <kaj@spyro-soft.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 8ce518b89879d418e4cf3ad0030b636879657861) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--examples/demos/thermostat/Thermostat.qmlproject2
-rw-r--r--examples/demos/thermostat/content/RoomItemForm.ui.qml2
-rw-r--r--examples/demos/thermostat/content/ScheduleViewForm.ui.qml2
-rw-r--r--examples/demos/thermostat/content/SideBarForm.ui.qml2
-rw-r--r--examples/demos/thermostat/content/StatisticsScrollViewForm.ui.qml2
-rw-r--r--examples/demos/thermostat/content/StatisticsViewForm.ui.qml2
-rw-r--r--examples/demos/thermostat/content/TemperatureSetterDesktopViewForm.ui.qml2
-rw-r--r--examples/demos/thermostat/content/TemperatureSetterForm.ui.qml2
-rw-r--r--examples/demos/thermostat/content/TemperatureSetterMobileViewForm.ui.qml2
-rw-r--r--examples/demos/thermostat/content/TemperatureSetterSmallViewForm.ui.qml2
-rw-r--r--examples/demos/thermostat/content/ThermostatInfoForm.ui.qml2
-rw-r--r--examples/demos/thermostat/content/ThermostatSettingsForm.ui.qml2
-rw-r--r--examples/demos/thermostat/content/ThermostatViewForm.ui.qml2
-rw-r--r--examples/demos/thermostat/content/TimeScheduleForm.ui.qml2
-rw-r--r--examples/demos/thermostat/imports/CMakeLists.txt2
-rw-r--r--examples/demos/thermostat/imports/ThermostatCustomControls/CMakeLists.txt (renamed from examples/demos/thermostat/imports/CustomControls/CMakeLists.txt)6
-rw-r--r--examples/demos/thermostat/imports/ThermostatCustomControls/CustomComboBox.qml (renamed from examples/demos/thermostat/imports/CustomControls/CustomComboBox.qml)0
-rw-r--r--examples/demos/thermostat/imports/ThermostatCustomControls/CustomDial.qml (renamed from examples/demos/thermostat/imports/CustomControls/CustomDial.qml)0
-rw-r--r--examples/demos/thermostat/imports/ThermostatCustomControls/CustomRadioButton.qml (renamed from examples/demos/thermostat/imports/CustomControls/CustomRadioButton.qml)0
-rw-r--r--examples/demos/thermostat/imports/ThermostatCustomControls/CustomRoundButton.qml (renamed from examples/demos/thermostat/imports/CustomControls/CustomRoundButton.qml)0
-rw-r--r--examples/demos/thermostat/imports/ThermostatCustomControls/CustomSlider.qml (renamed from examples/demos/thermostat/imports/CustomControls/CustomSlider.qml)0
-rw-r--r--examples/demos/thermostat/imports/ThermostatCustomControls/CustomSwitch.qml (renamed from examples/demos/thermostat/imports/CustomControls/CustomSwitch.qml)0
-rw-r--r--examples/demos/thermostat/imports/ThermostatCustomControls/CustomTextField.qml (renamed from examples/demos/thermostat/imports/CustomControls/CustomTextField.qml)0
-rw-r--r--examples/demos/thermostat/imports/ThermostatCustomControls/StatisticsChart.qml (renamed from examples/demos/thermostat/imports/CustomControls/StatisticsChart.qml)0
-rw-r--r--examples/demos/thermostat/imports/ThermostatCustomControls/TemperatureLabel.qml (renamed from examples/demos/thermostat/imports/CustomControls/TemperatureLabel.qml)0
-rw-r--r--examples/demos/thermostat/imports/ThermostatCustomControls/ThermostatControl.qml (renamed from examples/demos/thermostat/imports/CustomControls/ThermostatControl.qml)0
-rw-r--r--examples/demos/thermostat/imports/ThermostatCustomControls/TimeSelector.qml (renamed from examples/demos/thermostat/imports/CustomControls/TimeSelector.qml)0
-rw-r--r--examples/demos/thermostat/imports/ThermostatCustomControls/images/keyboard.svg (renamed from examples/demos/thermostat/imports/CustomControls/images/keyboard.svg)0
-rw-r--r--examples/demos/thermostat/imports/ThermostatCustomControls/images/thermometer.svg (renamed from examples/demos/thermostat/imports/CustomControls/images/thermometer.svg)0
-rw-r--r--examples/demos/thermostat/imports/ThermostatCustomControls/images/tooltip.svg (renamed from examples/demos/thermostat/imports/CustomControls/images/tooltip.svg)0
-rw-r--r--examples/demos/thermostat/imports/ThermostatCustomControls/qmldir (renamed from examples/demos/thermostat/imports/CustomControls/qmldir)2
-rw-r--r--examples/demos/thermostat/qmlmodules2
-rw-r--r--examples/demos/thermostat/src/import_qml_plugins.h2
33 files changed, 21 insertions, 21 deletions
diff --git a/examples/demos/thermostat/Thermostat.qmlproject b/examples/demos/thermostat/Thermostat.qmlproject
index c7534c361..fc5d1e8aa 100644
--- a/examples/demos/thermostat/Thermostat.qmlproject
+++ b/examples/demos/thermostat/Thermostat.qmlproject
@@ -37,7 +37,7 @@ Project {
Files {
filter: "qmldir"
- directory: "imports/CustomControls"
+ directory: "imports/ThermostatCustomControls"
}
Files {
diff --git a/examples/demos/thermostat/content/RoomItemForm.ui.qml b/examples/demos/thermostat/content/RoomItemForm.ui.qml
index 0f8de640e..849c2312c 100644
--- a/examples/demos/thermostat/content/RoomItemForm.ui.qml
+++ b/examples/demos/thermostat/content/RoomItemForm.ui.qml
@@ -12,7 +12,7 @@ import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import QtQuick.Effects
-import CustomControls
+import ThermostatCustomControls
import Thermostat
Pane {
diff --git a/examples/demos/thermostat/content/ScheduleViewForm.ui.qml b/examples/demos/thermostat/content/ScheduleViewForm.ui.qml
index c1a432a78..a629daff3 100644
--- a/examples/demos/thermostat/content/ScheduleViewForm.ui.qml
+++ b/examples/demos/thermostat/content/ScheduleViewForm.ui.qml
@@ -12,7 +12,7 @@ import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import Thermostat
-import CustomControls
+import ThermostatCustomControls
Pane {
id: root
diff --git a/examples/demos/thermostat/content/SideBarForm.ui.qml b/examples/demos/thermostat/content/SideBarForm.ui.qml
index fe92063a1..0bac7472a 100644
--- a/examples/demos/thermostat/content/SideBarForm.ui.qml
+++ b/examples/demos/thermostat/content/SideBarForm.ui.qml
@@ -13,7 +13,7 @@ import QtQuick.Controls
import QtQuick.Layouts
import QtQuick.Effects
import Thermostat
-import CustomControls
+import ThermostatCustomControls
Column {
id: root
diff --git a/examples/demos/thermostat/content/StatisticsScrollViewForm.ui.qml b/examples/demos/thermostat/content/StatisticsScrollViewForm.ui.qml
index 49b5ef15e..093641e13 100644
--- a/examples/demos/thermostat/content/StatisticsScrollViewForm.ui.qml
+++ b/examples/demos/thermostat/content/StatisticsScrollViewForm.ui.qml
@@ -11,7 +11,7 @@ Check out https://doc.qt.io/qtcreator/creator-quick-ui-forms.html for details on
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
-import CustomControls
+import ThermostatCustomControls
import Thermostat
ScrollView {
diff --git a/examples/demos/thermostat/content/StatisticsViewForm.ui.qml b/examples/demos/thermostat/content/StatisticsViewForm.ui.qml
index 265564b3a..b1b976c0b 100644
--- a/examples/demos/thermostat/content/StatisticsViewForm.ui.qml
+++ b/examples/demos/thermostat/content/StatisticsViewForm.ui.qml
@@ -12,7 +12,7 @@ import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import Thermostat
-import CustomControls
+import ThermostatCustomControls
Pane {
id: root
diff --git a/examples/demos/thermostat/content/TemperatureSetterDesktopViewForm.ui.qml b/examples/demos/thermostat/content/TemperatureSetterDesktopViewForm.ui.qml
index 7d5dd68a3..cd5215360 100644
--- a/examples/demos/thermostat/content/TemperatureSetterDesktopViewForm.ui.qml
+++ b/examples/demos/thermostat/content/TemperatureSetterDesktopViewForm.ui.qml
@@ -12,7 +12,7 @@ import QtQuick.Controls
import QtQuick.Layouts
import QtQuick.Effects
import Thermostat
-import CustomControls
+import ThermostatCustomControls
Pane {
width: 1087
diff --git a/examples/demos/thermostat/content/TemperatureSetterForm.ui.qml b/examples/demos/thermostat/content/TemperatureSetterForm.ui.qml
index 53f670280..5baa5eeee 100644
--- a/examples/demos/thermostat/content/TemperatureSetterForm.ui.qml
+++ b/examples/demos/thermostat/content/TemperatureSetterForm.ui.qml
@@ -11,7 +11,7 @@ import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import Thermostat
-import CustomControls
+import ThermostatCustomControls
Pane {
width: 1087
diff --git a/examples/demos/thermostat/content/TemperatureSetterMobileViewForm.ui.qml b/examples/demos/thermostat/content/TemperatureSetterMobileViewForm.ui.qml
index f509061b9..7a5349175 100644
--- a/examples/demos/thermostat/content/TemperatureSetterMobileViewForm.ui.qml
+++ b/examples/demos/thermostat/content/TemperatureSetterMobileViewForm.ui.qml
@@ -13,7 +13,7 @@ import QtQuick.Controls
import QtQuick.Layouts
import QtQuick.Effects
import Thermostat
-import CustomControls
+import ThermostatCustomControls
Pane {
width: 329
diff --git a/examples/demos/thermostat/content/TemperatureSetterSmallViewForm.ui.qml b/examples/demos/thermostat/content/TemperatureSetterSmallViewForm.ui.qml
index d0688361a..8cf1f0f8c 100644
--- a/examples/demos/thermostat/content/TemperatureSetterSmallViewForm.ui.qml
+++ b/examples/demos/thermostat/content/TemperatureSetterSmallViewForm.ui.qml
@@ -13,7 +13,7 @@ import QtQuick.Controls
import QtQuick.Layouts
import QtQuick.Effects
import Thermostat
-import CustomControls
+import ThermostatCustomControls
Pane {
width: 400
diff --git a/examples/demos/thermostat/content/ThermostatInfoForm.ui.qml b/examples/demos/thermostat/content/ThermostatInfoForm.ui.qml
index 515963289..3a8e7ff7d 100644
--- a/examples/demos/thermostat/content/ThermostatInfoForm.ui.qml
+++ b/examples/demos/thermostat/content/ThermostatInfoForm.ui.qml
@@ -13,7 +13,7 @@ import QtQuick.Controls
import QtQuick.Layouts
import QtQuick.Effects
import Thermostat
-import CustomControls
+import ThermostatCustomControls
Pane {
id: root
diff --git a/examples/demos/thermostat/content/ThermostatSettingsForm.ui.qml b/examples/demos/thermostat/content/ThermostatSettingsForm.ui.qml
index 8929785c8..c83c58ee0 100644
--- a/examples/demos/thermostat/content/ThermostatSettingsForm.ui.qml
+++ b/examples/demos/thermostat/content/ThermostatSettingsForm.ui.qml
@@ -11,7 +11,7 @@ Check out https://doc.qt.io/qtcreator/creator-quick-ui-forms.html for details on
import QtQuick
import QtQuick.Controls
import QtQuick.Effects
-import CustomControls
+import ThermostatCustomControls
import Thermostat
Pane {
diff --git a/examples/demos/thermostat/content/ThermostatViewForm.ui.qml b/examples/demos/thermostat/content/ThermostatViewForm.ui.qml
index f27e00be5..01a8f6b29 100644
--- a/examples/demos/thermostat/content/ThermostatViewForm.ui.qml
+++ b/examples/demos/thermostat/content/ThermostatViewForm.ui.qml
@@ -12,7 +12,7 @@ import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import Thermostat
-import CustomControls
+import ThermostatCustomControls
Pane {
id: root
diff --git a/examples/demos/thermostat/content/TimeScheduleForm.ui.qml b/examples/demos/thermostat/content/TimeScheduleForm.ui.qml
index b78b486d7..198127d54 100644
--- a/examples/demos/thermostat/content/TimeScheduleForm.ui.qml
+++ b/examples/demos/thermostat/content/TimeScheduleForm.ui.qml
@@ -12,7 +12,7 @@ import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import Thermostat
-import CustomControls
+import ThermostatCustomControls
Pane {
width: 1087
diff --git a/examples/demos/thermostat/imports/CMakeLists.txt b/examples/demos/thermostat/imports/CMakeLists.txt
index 42cff97be..7bcf4a8d9 100644
--- a/examples/demos/thermostat/imports/CMakeLists.txt
+++ b/examples/demos/thermostat/imports/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright (C) 2023 The Qt Company Ltd.
# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
-add_subdirectory(CustomControls)
+add_subdirectory(ThermostatCustomControls)
add_subdirectory(Thermostat)
diff --git a/examples/demos/thermostat/imports/CustomControls/CMakeLists.txt b/examples/demos/thermostat/imports/ThermostatCustomControls/CMakeLists.txt
index 4e16ec2d9..0ef8ce77b 100644
--- a/examples/demos/thermostat/imports/CustomControls/CMakeLists.txt
+++ b/examples/demos/thermostat/imports/ThermostatCustomControls/CMakeLists.txt
@@ -1,9 +1,9 @@
# Copyright (C) 2023 The Qt Company Ltd.
# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
-qt_add_library(CustomControls STATIC)
-qt_add_qml_module(CustomControls
- URI "CustomControls"
+qt_add_library(ThermostatCustomControls STATIC)
+qt_add_qml_module(ThermostatCustomControls
+ URI "ThermostatCustomControls"
VERSION 1.0
QML_FILES
CustomComboBox.qml
diff --git a/examples/demos/thermostat/imports/CustomControls/CustomComboBox.qml b/examples/demos/thermostat/imports/ThermostatCustomControls/CustomComboBox.qml
index f6b7de4f1..f6b7de4f1 100644
--- a/examples/demos/thermostat/imports/CustomControls/CustomComboBox.qml
+++ b/examples/demos/thermostat/imports/ThermostatCustomControls/CustomComboBox.qml
diff --git a/examples/demos/thermostat/imports/CustomControls/CustomDial.qml b/examples/demos/thermostat/imports/ThermostatCustomControls/CustomDial.qml
index b8c25e46f..b8c25e46f 100644
--- a/examples/demos/thermostat/imports/CustomControls/CustomDial.qml
+++ b/examples/demos/thermostat/imports/ThermostatCustomControls/CustomDial.qml
diff --git a/examples/demos/thermostat/imports/CustomControls/CustomRadioButton.qml b/examples/demos/thermostat/imports/ThermostatCustomControls/CustomRadioButton.qml
index b5266aee3..b5266aee3 100644
--- a/examples/demos/thermostat/imports/CustomControls/CustomRadioButton.qml
+++ b/examples/demos/thermostat/imports/ThermostatCustomControls/CustomRadioButton.qml
diff --git a/examples/demos/thermostat/imports/CustomControls/CustomRoundButton.qml b/examples/demos/thermostat/imports/ThermostatCustomControls/CustomRoundButton.qml
index 315787bce..315787bce 100644
--- a/examples/demos/thermostat/imports/CustomControls/CustomRoundButton.qml
+++ b/examples/demos/thermostat/imports/ThermostatCustomControls/CustomRoundButton.qml
diff --git a/examples/demos/thermostat/imports/CustomControls/CustomSlider.qml b/examples/demos/thermostat/imports/ThermostatCustomControls/CustomSlider.qml
index cad365416..cad365416 100644
--- a/examples/demos/thermostat/imports/CustomControls/CustomSlider.qml
+++ b/examples/demos/thermostat/imports/ThermostatCustomControls/CustomSlider.qml
diff --git a/examples/demos/thermostat/imports/CustomControls/CustomSwitch.qml b/examples/demos/thermostat/imports/ThermostatCustomControls/CustomSwitch.qml
index b5fcc8ae6..b5fcc8ae6 100644
--- a/examples/demos/thermostat/imports/CustomControls/CustomSwitch.qml
+++ b/examples/demos/thermostat/imports/ThermostatCustomControls/CustomSwitch.qml
diff --git a/examples/demos/thermostat/imports/CustomControls/CustomTextField.qml b/examples/demos/thermostat/imports/ThermostatCustomControls/CustomTextField.qml
index 9405192e2..9405192e2 100644
--- a/examples/demos/thermostat/imports/CustomControls/CustomTextField.qml
+++ b/examples/demos/thermostat/imports/ThermostatCustomControls/CustomTextField.qml
diff --git a/examples/demos/thermostat/imports/CustomControls/StatisticsChart.qml b/examples/demos/thermostat/imports/ThermostatCustomControls/StatisticsChart.qml
index 7ffb2d44a..7ffb2d44a 100644
--- a/examples/demos/thermostat/imports/CustomControls/StatisticsChart.qml
+++ b/examples/demos/thermostat/imports/ThermostatCustomControls/StatisticsChart.qml
diff --git a/examples/demos/thermostat/imports/CustomControls/TemperatureLabel.qml b/examples/demos/thermostat/imports/ThermostatCustomControls/TemperatureLabel.qml
index d0da26b2f..d0da26b2f 100644
--- a/examples/demos/thermostat/imports/CustomControls/TemperatureLabel.qml
+++ b/examples/demos/thermostat/imports/ThermostatCustomControls/TemperatureLabel.qml
diff --git a/examples/demos/thermostat/imports/CustomControls/ThermostatControl.qml b/examples/demos/thermostat/imports/ThermostatCustomControls/ThermostatControl.qml
index 170f464f5..170f464f5 100644
--- a/examples/demos/thermostat/imports/CustomControls/ThermostatControl.qml
+++ b/examples/demos/thermostat/imports/ThermostatCustomControls/ThermostatControl.qml
diff --git a/examples/demos/thermostat/imports/CustomControls/TimeSelector.qml b/examples/demos/thermostat/imports/ThermostatCustomControls/TimeSelector.qml
index 5a50ac529..5a50ac529 100644
--- a/examples/demos/thermostat/imports/CustomControls/TimeSelector.qml
+++ b/examples/demos/thermostat/imports/ThermostatCustomControls/TimeSelector.qml
diff --git a/examples/demos/thermostat/imports/CustomControls/images/keyboard.svg b/examples/demos/thermostat/imports/ThermostatCustomControls/images/keyboard.svg
index fdc818fbc..fdc818fbc 100644
--- a/examples/demos/thermostat/imports/CustomControls/images/keyboard.svg
+++ b/examples/demos/thermostat/imports/ThermostatCustomControls/images/keyboard.svg
diff --git a/examples/demos/thermostat/imports/CustomControls/images/thermometer.svg b/examples/demos/thermostat/imports/ThermostatCustomControls/images/thermometer.svg
index 6b36c5e75..6b36c5e75 100644
--- a/examples/demos/thermostat/imports/CustomControls/images/thermometer.svg
+++ b/examples/demos/thermostat/imports/ThermostatCustomControls/images/thermometer.svg
diff --git a/examples/demos/thermostat/imports/CustomControls/images/tooltip.svg b/examples/demos/thermostat/imports/ThermostatCustomControls/images/tooltip.svg
index 6846231f2..6846231f2 100644
--- a/examples/demos/thermostat/imports/CustomControls/images/tooltip.svg
+++ b/examples/demos/thermostat/imports/ThermostatCustomControls/images/tooltip.svg
diff --git a/examples/demos/thermostat/imports/CustomControls/qmldir b/examples/demos/thermostat/imports/ThermostatCustomControls/qmldir
index bc31f4f21..639f7af3f 100644
--- a/examples/demos/thermostat/imports/CustomControls/qmldir
+++ b/examples/demos/thermostat/imports/ThermostatCustomControls/qmldir
@@ -1,7 +1,7 @@
# Copyright (C) 2023 The Qt Company Ltd.
# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
-module CustomControls
+module ThermostatCustomControls
CustomSwitch 1.0 CustomSwitch.qml
CustomComboBox 1.0 CustomComboBox.qml
StatisticsChart 1.0 StatisticsChart.qml
diff --git a/examples/demos/thermostat/qmlmodules b/examples/demos/thermostat/qmlmodules
index d9aa59bf2..dba42bb44 100644
--- a/examples/demos/thermostat/qmlmodules
+++ b/examples/demos/thermostat/qmlmodules
@@ -13,6 +13,6 @@ add_subdirectory(imports)
target_link_libraries(ThermostatApp PRIVATE
contentplugin
- CustomControlsplugin
+ ThermostatCustomControlsplugin
Thermostatplugin
)
diff --git a/examples/demos/thermostat/src/import_qml_plugins.h b/examples/demos/thermostat/src/import_qml_plugins.h
index aa78e5e2f..2dda8dc4d 100644
--- a/examples/demos/thermostat/src/import_qml_plugins.h
+++ b/examples/demos/thermostat/src/import_qml_plugins.h
@@ -4,6 +4,6 @@
#include <QtQml/qqmlextensionplugin.h>
Q_IMPORT_QML_PLUGIN(contentPlugin)
-Q_IMPORT_QML_PLUGIN(CustomControlsPlugin)
+Q_IMPORT_QML_PLUGIN(ThermostatCustomControlsPlugin)
Q_IMPORT_QML_PLUGIN(ThermostatPlugin)