From aaa2dd7e8327316e13b39bb93f885821af0fe48a Mon Sep 17 00:00:00 2001 From: Nodir Temirkhodjaev Date: Sun, 15 Apr 2018 11:08:46 +0500 Subject: [PATCH] UI: Update Qt 5.12 --- deploy/qt/imports/QtQuick/Controls.2/CheckDelegate.qml | 2 +- deploy/qt/imports/QtQuick/Controls.2/ItemDelegate.qml | 2 +- deploy/qt/imports/QtQuick/Controls.2/MenuBarItem.qml | 2 +- deploy/qt/imports/QtQuick/Controls.2/MenuItem.qml | 2 +- deploy/qt/imports/QtQuick/Controls.2/RadioDelegate.qml | 2 +- deploy/qt/imports/QtQuick/Controls.2/SwipeDelegate.qml | 2 +- deploy/qt/imports/QtQuick/Controls.2/SwitchDelegate.qml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/deploy/qt/imports/QtQuick/Controls.2/CheckDelegate.qml b/deploy/qt/imports/QtQuick/Controls.2/CheckDelegate.qml index d1572e2e..322d1c2d 100644 --- a/deploy/qt/imports/QtQuick/Controls.2/CheckDelegate.qml +++ b/deploy/qt/imports/QtQuick/Controls.2/CheckDelegate.qml @@ -46,7 +46,7 @@ T.CheckDelegate { implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, Math.max(implicitContentHeight, - indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + implicitIndicatorHeight) + topPadding + bottomPadding) padding: 12 spacing: 12 diff --git a/deploy/qt/imports/QtQuick/Controls.2/ItemDelegate.qml b/deploy/qt/imports/QtQuick/Controls.2/ItemDelegate.qml index 499c90a6..cd8bccb4 100644 --- a/deploy/qt/imports/QtQuick/Controls.2/ItemDelegate.qml +++ b/deploy/qt/imports/QtQuick/Controls.2/ItemDelegate.qml @@ -46,7 +46,7 @@ T.ItemDelegate { implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, Math.max(implicitContentHeight, - indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + implicitIndicatorHeight) + topPadding + bottomPadding) padding: 12 spacing: 8 diff --git a/deploy/qt/imports/QtQuick/Controls.2/MenuBarItem.qml b/deploy/qt/imports/QtQuick/Controls.2/MenuBarItem.qml index 24c33b8e..078f0302 100644 --- a/deploy/qt/imports/QtQuick/Controls.2/MenuBarItem.qml +++ b/deploy/qt/imports/QtQuick/Controls.2/MenuBarItem.qml @@ -46,7 +46,7 @@ T.MenuBarItem { implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, Math.max(implicitContentHeight, - indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + implicitIndicatorHeight) + topPadding + bottomPadding) spacing: 6 padding: 6 diff --git a/deploy/qt/imports/QtQuick/Controls.2/MenuItem.qml b/deploy/qt/imports/QtQuick/Controls.2/MenuItem.qml index 184f6751..3db3fd33 100644 --- a/deploy/qt/imports/QtQuick/Controls.2/MenuItem.qml +++ b/deploy/qt/imports/QtQuick/Controls.2/MenuItem.qml @@ -46,7 +46,7 @@ T.MenuItem { implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, Math.max(implicitContentHeight, - indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + implicitIndicatorHeight) + topPadding + bottomPadding) padding: 6 spacing: 6 diff --git a/deploy/qt/imports/QtQuick/Controls.2/RadioDelegate.qml b/deploy/qt/imports/QtQuick/Controls.2/RadioDelegate.qml index 5f75f9aa..abb33b38 100644 --- a/deploy/qt/imports/QtQuick/Controls.2/RadioDelegate.qml +++ b/deploy/qt/imports/QtQuick/Controls.2/RadioDelegate.qml @@ -46,7 +46,7 @@ T.RadioDelegate { implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, Math.max(implicitContentHeight, - indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + implicitIndicatorHeight) + topPadding + bottomPadding) padding: 12 spacing: 12 diff --git a/deploy/qt/imports/QtQuick/Controls.2/SwipeDelegate.qml b/deploy/qt/imports/QtQuick/Controls.2/SwipeDelegate.qml index 89d45a2d..dbef8165 100644 --- a/deploy/qt/imports/QtQuick/Controls.2/SwipeDelegate.qml +++ b/deploy/qt/imports/QtQuick/Controls.2/SwipeDelegate.qml @@ -46,7 +46,7 @@ T.SwipeDelegate { implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, Math.max(implicitContentHeight, - indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + implicitIndicatorHeight) + topPadding + bottomPadding) padding: 12 spacing: 12 diff --git a/deploy/qt/imports/QtQuick/Controls.2/SwitchDelegate.qml b/deploy/qt/imports/QtQuick/Controls.2/SwitchDelegate.qml index 9554e2d2..33de91d7 100644 --- a/deploy/qt/imports/QtQuick/Controls.2/SwitchDelegate.qml +++ b/deploy/qt/imports/QtQuick/Controls.2/SwitchDelegate.qml @@ -46,7 +46,7 @@ T.SwitchDelegate { implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, Math.max(implicitContentHeight, - indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + implicitIndicatorHeight) + topPadding + bottomPadding) padding: 12 spacing: 12