diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-03-23 09:36:21 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-03-23 09:25:19 +0000 |
| commit | c4de17f8ce0abd2d97c99da2073131d15a93ab83 (patch) | |
| tree | a4e19ec73ce4e9da8bd7d4876d06dcf8f7daa7d4 | |
| parent | d44d75180a40d32c175fff4f12154289ad0fc5be (diff) | |
Popup.qml: fix typo
Task-number: QTBUG-59661
Change-Id: I35627bafc57266cb7b2842fe02765536ca7eecba
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
| -rw-r--r-- | src/imports/controls/Popup.qml | 2 | ||||
| -rw-r--r-- | src/imports/controls/material/Popup.qml | 2 | ||||
| -rw-r--r-- | src/imports/controls/universal/Popup.qml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/imports/controls/Popup.qml b/src/imports/controls/Popup.qml index 2c68154a..4a7a1dfd 100644 --- a/src/imports/controls/Popup.qml +++ b/src/imports/controls/Popup.qml @@ -45,7 +45,7 @@ T.Popup { implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth > 0 ? contentWidth + leftPadding + rightPadding : 0) implicitHeight: Math.max(background ? background.implicitHeight : 0, - contentWidth > 0 ? contentHeight + topPadding + bottomPadding : 0) + contentHeight > 0 ? contentHeight + topPadding + bottomPadding : 0) contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) diff --git a/src/imports/controls/material/Popup.qml b/src/imports/controls/material/Popup.qml index 04b58c2a..cfcf00cb 100644 --- a/src/imports/controls/material/Popup.qml +++ b/src/imports/controls/material/Popup.qml @@ -47,7 +47,7 @@ T.Popup { implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth > 0 ? contentWidth + leftPadding + rightPadding : 0) implicitHeight: Math.max(background ? background.implicitHeight : 0, - contentWidth > 0 ? contentHeight + topPadding + bottomPadding : 0) + contentHeight > 0 ? contentHeight + topPadding + bottomPadding : 0) contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) diff --git a/src/imports/controls/universal/Popup.qml b/src/imports/controls/universal/Popup.qml index 2c582217..0e42219c 100644 --- a/src/imports/controls/universal/Popup.qml +++ b/src/imports/controls/universal/Popup.qml @@ -44,7 +44,7 @@ T.Popup { implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth > 0 ? contentWidth + leftPadding + rightPadding : 0) implicitHeight: Math.max(background ? background.implicitHeight : 0, - contentWidth > 0 ? contentHeight + topPadding + bottomPadding : 0) + contentHeight > 0 ? contentHeight + topPadding + bottomPadding : 0) contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) |