aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKwangsub Kim <kwangsub.kim@qt.io>2024-01-04 09:35:57 +0100
committerKwangsub Kim <kwangsub.kim@qt.io>2024-01-12 17:41:56 +0100
commitde28bdbdfb1a9393ca87febafb319125e5578d11 (patch)
treec79d43b4ad784f0e85574d717206b92ebb2bf11c
parent5736952b4b0c8aab4ae56b622ea9a53ae718b60a (diff)
Rename Qul Application type to ApplicationScreensqds-dev-4.4-snapshot1
Application type in QtQuickUltralite caused conflict with the Application in QtQuick, so that the name needs to be changed to avoid the confusion. Task-number: UL-8266 Change-Id: I8c7a44757d260af85024911bb105e16bc31489bd Reviewed-by: Yasser Grimes <yasser.grimes@qt.io> Reviewed-by: Aleksei German <aleksei.german@qt.io>
-rw-r--r--src/imports/compat/Layers/ApplicationScreens.qml (renamed from src/imports/compat/Layers/Application.qml)4
-rw-r--r--src/imports/compat/Layers/CMakeLists.txt2
-rw-r--r--src/imports/compat/Layers/designer/ApplicationScreensSpecifics.qml (renamed from src/imports/compat/Layers/designer/ApplicationSpecifics.qml)8
-rw-r--r--src/imports/compat/Layers/designer/QtQuickUltraliteLayers.metainfo4
-rw-r--r--src/imports/compat/Layers/qmldir6
5 files changed, 12 insertions, 12 deletions
diff --git a/src/imports/compat/Layers/Application.qml b/src/imports/compat/Layers/ApplicationScreens.qml
index f13f25e..e4adced 100644
--- a/src/imports/compat/Layers/Application.qml
+++ b/src/imports/compat/Layers/ApplicationScreens.qml
@@ -29,7 +29,7 @@
import QtQuick 2.15
-//! [Application compatibility]
+//! [ApplicationScreens compatibility]
Item {
}
-//! [Application compatibility]
+//! [ApplicationScreens compatibility]
diff --git a/src/imports/compat/Layers/CMakeLists.txt b/src/imports/compat/Layers/CMakeLists.txt
index 11ac13e..f66b5c4 100644
--- a/src/imports/compat/Layers/CMakeLists.txt
+++ b/src/imports/compat/Layers/CMakeLists.txt
@@ -7,7 +7,7 @@ qt_internal_add_qml_module(QuickUltraLiteStudioLayers
1
2
QML_FILES
- Application.qml
+ ApplicationScreens.qml
ImageLayer.qml
ItemLayer.qml
Screen.qml
diff --git a/src/imports/compat/Layers/designer/ApplicationSpecifics.qml b/src/imports/compat/Layers/designer/ApplicationScreensSpecifics.qml
index 58374ef..a1aeffe 100644
--- a/src/imports/compat/Layers/designer/ApplicationSpecifics.qml
+++ b/src/imports/compat/Layers/designer/ApplicationScreensSpecifics.qml
@@ -32,12 +32,12 @@ import QtQuick 2.15
import HelperWidgets 2.0
import QtQuick.Layouts 1.0
-//! [Application compatibility]
+//! [ApplicationScreens compatibility]
Section {
anchors.left: parent.left
anchors.right: parent.right
- caption: qsTr("Application")
+ caption: qsTr("Application Screens")
- //Application type has no properties
+ //ApplicationScreens type has no properties
}
-//! [Application compatibility]
+//! [ApplicationScreens compatibility]
diff --git a/src/imports/compat/Layers/designer/QtQuickUltraliteLayers.metainfo b/src/imports/compat/Layers/designer/QtQuickUltraliteLayers.metainfo
index c16fb25..9c8d538 100644
--- a/src/imports/compat/Layers/designer/QtQuickUltraliteLayers.metainfo
+++ b/src/imports/compat/Layers/designer/QtQuickUltraliteLayers.metainfo
@@ -1,10 +1,10 @@
MetaInfo {
Type {
- name: "QtQuickUltralite.Layers.Application"
+ name: "QtQuickUltralite.Layers.ApplicationScreens"
icon: "images/item-icon.png"
ItemLibraryEntry {
- name: "Application"
+ name: "Application Screens"
category: "QtQuickUltralite - Layers"
libraryIcon: "images/item-icon@2x.png"
version: "1.0"
diff --git a/src/imports/compat/Layers/qmldir b/src/imports/compat/Layers/qmldir
index 0968b7e..4257ae6 100644
--- a/src/imports/compat/Layers/qmldir
+++ b/src/imports/compat/Layers/qmldir
@@ -5,9 +5,9 @@ optional plugin studioqtquickultralitelayersplugin
classname QtQuickUltralite_LayersPlugin
typeinfo studioqtquickultralitelayers.qmltypes
prefer :/QtQuickUltralite/Layers/
-Application 1.0 Application.qml
-Application 2.0 Application.qml
-Application 6.0 Application.qml
+ApplicationScreens 1.0 ApplicationScreens.qml
+ApplicationScreens 2.0 ApplicationScreens.qml
+ApplicationScreens 6.0 ApplicationScreens.qml
ImageLayer 1.0 ImageLayer.qml
ImageLayer 2.0 ImageLayer.qml
ImageLayer 6.0 ImageLayer.qml