aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSze Howe Koh <[email protected]>2023-02-15 15:56:25 +0800
committerSze Howe Koh <[email protected]>2023-02-21 16:20:51 +0800
commit05c16d8e1c058fe872e17b2d00ed32a8057f032a (patch)
treeb22e1bfe343570b14bcca84368222b54451d8460
parent0737bb84e2bcf6acafe8e9892179234fd0926bdf (diff)
DialogButtonBox: Fix contentWidth warnings
Warning: Property "contentWidth" not found on type "QQuickItem" Task-number: QTBUG-110934 Change-Id: I5c64ebbe1400e02d4a853a2cb69874c0b3ba3252 Pick-to: 6.5 6.4 Reviewed-by: Qt CI Bot <[email protected]> Reviewed-by: Mitch Curtis <[email protected]>
-rw-r--r--src/quickcontrols/basic/DialogButtonBox.qml4
-rw-r--r--src/quickcontrols/universal/DialogButtonBox.qml4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/quickcontrols/basic/DialogButtonBox.qml b/src/quickcontrols/basic/DialogButtonBox.qml
index 89fca1e41d..d28c77604b 100644
--- a/src/quickcontrols/basic/DialogButtonBox.qml
+++ b/src/quickcontrols/basic/DialogButtonBox.qml
@@ -1,4 +1,4 @@
-// Copyright (C) 2017 The Qt Company Ltd.
+// Copyright (C) 2023 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
import QtQuick
@@ -11,7 +11,7 @@ T.DialogButtonBox {
(control.count === 1 ? implicitContentWidth * 2 : implicitContentWidth) + leftPadding + rightPadding)
implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
implicitContentHeight + topPadding + bottomPadding)
- contentWidth: contentItem.contentWidth
+ contentWidth: (contentItem as ListView).contentWidth // QTBUG-111283 blocks optional chaining + nullish coalescing
spacing: 1
padding: 12
diff --git a/src/quickcontrols/universal/DialogButtonBox.qml b/src/quickcontrols/universal/DialogButtonBox.qml
index 826a13efd3..e3bbdcb1b3 100644
--- a/src/quickcontrols/universal/DialogButtonBox.qml
+++ b/src/quickcontrols/universal/DialogButtonBox.qml
@@ -1,4 +1,4 @@
-// Copyright (C) 2017 The Qt Company Ltd.
+// Copyright (C) 2023 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
import QtQuick
@@ -12,7 +12,7 @@ T.DialogButtonBox {
(control.count === 1 ? implicitContentWidth * 2 : implicitContentWidth) + leftPadding + rightPadding)
implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
implicitContentHeight + topPadding + bottomPadding)
- contentWidth: contentItem.contentWidth
+ contentWidth: (contentItem as ListView).contentWidth // QTBUG-111283 blocks optional chaining + nullish coalescing
spacing: 4
padding: 24