aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports
diff options
context:
space:
mode:
Diffstat (limited to 'src/imports')
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-groupbox-custom.pngbin3885 -> 3551 bytes
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-custom.qml8
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate.qml4
-rw-r--r--src/imports/platform/qquickplatformdialog_p.h2
-rw-r--r--src/imports/platform/qquickplatformmenu.cpp8
-rw-r--r--src/imports/platform/qquickplatformmenubar.cpp6
-rw-r--r--src/imports/platform/qquickplatformmenuitemgroup.cpp8
7 files changed, 22 insertions, 14 deletions
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-groupbox-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-groupbox-custom.png
index 29f0a60d..3a585d9f 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-groupbox-custom.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-groupbox-custom.png
Binary files differ
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-custom.qml
index feafe263..cdab3e62 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-custom.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-custom.qml
@@ -42,6 +42,14 @@ GroupBox {
radius: 2
}
+ label: Label {
+ x: control.leftPadding
+ width: control.availableWidth
+ text: control.title
+ color: "#21be2b"
+ elide: Text.ElideRight
+ }
+
Label {
text: qsTr("Content goes here!")
}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate.qml
index 9eb3d71c..7fa76f13 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate.qml
@@ -56,8 +56,8 @@ ListView {
easing.type: Easing.InOutQuad
}
PropertyAction {
- target: swipeDelegate;
- property: "ListView.delayRemove";
+ target: swipeDelegate
+ property: "ListView.delayRemove"
value: false
}
}
diff --git a/src/imports/platform/qquickplatformdialog_p.h b/src/imports/platform/qquickplatformdialog_p.h
index ba4c5d5f..55a54937 100644
--- a/src/imports/platform/qquickplatformdialog_p.h
+++ b/src/imports/platform/qquickplatformdialog_p.h
@@ -72,7 +72,6 @@ class QQuickPlatformDialog : public QObject, public QQmlParserStatus
Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleChanged FINAL)
Q_PROPERTY(int result READ result WRITE setResult NOTIFY resultChanged FINAL)
Q_CLASSINFO("DefaultProperty", "data")
- Q_ENUMS(StandardCode)
public:
explicit QQuickPlatformDialog(QPlatformTheme::DialogType type, QObject *parent = nullptr);
@@ -98,6 +97,7 @@ public:
void setVisible(bool visible);
enum StandardCode { Rejected, Accepted };
+ Q_ENUM(StandardCode)
int result() const;
void setResult(int result);
diff --git a/src/imports/platform/qquickplatformmenu.cpp b/src/imports/platform/qquickplatformmenu.cpp
index fbef8b8d..82adb6c3 100644
--- a/src/imports/platform/qquickplatformmenu.cpp
+++ b/src/imports/platform/qquickplatformmenu.cpp
@@ -153,7 +153,7 @@ QQuickPlatformMenu::~QQuickPlatformMenu()
m_menuBar->removeMenu(this);
if (m_parentMenu)
m_parentMenu->removeMenu(this);
- for (QQuickPlatformMenuItem *item : m_items) {
+ for (QQuickPlatformMenuItem *item : qAsConst(m_items)) {
if (QQuickPlatformMenu *subMenu = item->subMenu())
subMenu->setParentMenu(nullptr);
item->setMenu(nullptr);
@@ -197,7 +197,7 @@ QPlatformMenu * QQuickPlatformMenu::create()
connect(m_handle, &QPlatformMenu::aboutToShow, this, &QQuickPlatformMenu::aboutToShow);
connect(m_handle, &QPlatformMenu::aboutToHide, this, &QQuickPlatformMenu::aboutToHide);
- for (QQuickPlatformMenuItem *item : m_items)
+ for (QQuickPlatformMenuItem *item : qAsConst(m_items))
m_handle->insertMenuItem(item->create(), nullptr);
if (m_menuItem) {
@@ -237,7 +237,7 @@ void QQuickPlatformMenu::sync()
m_systemTrayIcon->handle()->updateMenu(m_handle);
#endif
- for (QQuickPlatformMenuItem *item : m_items)
+ for (QQuickPlatformMenuItem *item : qAsConst(m_items))
item->sync();
}
@@ -637,7 +637,7 @@ void QQuickPlatformMenu::clear()
if (m_items.isEmpty())
return;
- for (QQuickPlatformMenuItem *item : m_items) {
+ for (QQuickPlatformMenuItem *item : qAsConst(m_items)) {
m_data.removeOne(item);
if (m_handle)
m_handle->removeMenuItem(item->handle());
diff --git a/src/imports/platform/qquickplatformmenubar.cpp b/src/imports/platform/qquickplatformmenubar.cpp
index 516bcc3e..4487b9a7 100644
--- a/src/imports/platform/qquickplatformmenubar.cpp
+++ b/src/imports/platform/qquickplatformmenubar.cpp
@@ -117,7 +117,7 @@ QQuickPlatformMenuBar::QQuickPlatformMenuBar(QObject *parent)
QQuickPlatformMenuBar::~QQuickPlatformMenuBar()
{
- for (QQuickPlatformMenu *menu : m_menus)
+ for (QQuickPlatformMenu *menu : qAsConst(m_menus))
menu->setMenuBar(nullptr);
delete m_handle;
m_handle = nullptr;
@@ -235,7 +235,7 @@ void QQuickPlatformMenuBar::clear()
if (m_menus.isEmpty())
return;
- for (QQuickPlatformMenu *menu : m_menus) {
+ for (QQuickPlatformMenu *menu : qAsConst(m_menus)) {
m_data.removeOne(menu);
if (m_handle)
m_handle->removeMenu(menu->handle());
@@ -254,7 +254,7 @@ void QQuickPlatformMenuBar::classBegin()
void QQuickPlatformMenuBar::componentComplete()
{
m_complete = true;
- for (QQuickPlatformMenu *menu : m_menus)
+ for (QQuickPlatformMenu *menu : qAsConst(m_menus))
menu->sync();
if (!m_window)
setWindow(findWindow());
diff --git a/src/imports/platform/qquickplatformmenuitemgroup.cpp b/src/imports/platform/qquickplatformmenuitemgroup.cpp
index af901bb8..f07d0a1b 100644
--- a/src/imports/platform/qquickplatformmenuitemgroup.cpp
+++ b/src/imports/platform/qquickplatformmenuitemgroup.cpp
@@ -164,7 +164,7 @@ void QQuickPlatformMenuItemGroup::setEnabled(bool enabled)
m_enabled = enabled;
emit enabledChanged();
- for (QQuickPlatformMenuItem *item : m_items) {
+ for (QQuickPlatformMenuItem *item : qAsConst(m_items)) {
if (item->m_enabled) {
item->sync();
emit item->enabledChanged();
@@ -193,7 +193,7 @@ void QQuickPlatformMenuItemGroup::setVisible(bool visible)
m_visible = visible;
emit visibleChanged();
- for (QQuickPlatformMenuItem *item : m_items) {
+ for (QQuickPlatformMenuItem *item : qAsConst(m_items)) {
if (item->m_visible) {
item->sync();
emit item->visibleChanged();
@@ -222,7 +222,7 @@ void QQuickPlatformMenuItemGroup::setExclusive(bool exclusive)
m_exclusive = exclusive;
emit exclusiveChanged();
- for (QQuickPlatformMenuItem *item : m_items)
+ for (QQuickPlatformMenuItem *item : qAsConst(m_items))
item->sync();
}
@@ -317,7 +317,7 @@ void QQuickPlatformMenuItemGroup::clear()
if (m_items.isEmpty())
return;
- for (QQuickPlatformMenuItem *item : m_items) {
+ for (QQuickPlatformMenuItem *item : qAsConst(m_items)) {
item->setGroup(nullptr);
disconnect(item, &QQuickPlatformMenuItem::checkedChanged, this, &QQuickPlatformMenuItemGroup::updateCurrent);
disconnect(item, &QQuickPlatformMenuItem::triggered, this, &QQuickPlatformMenuItemGroup::activateItem);
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-05 01:25:35 +0000