diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
commit | d934827bf44b7cfcf6711964418148fa60877668 (patch) | |
tree | 0625f358789b5e015e49db139cc1dbc9be00428f /dev-qt/qtquickcontrols2 | |
parent | 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff) |
gentoo resync : 25.11.2020
Diffstat (limited to 'dev-qt/qtquickcontrols2')
4 files changed, 2 insertions, 100 deletions
diff --git a/dev-qt/qtquickcontrols2/Manifest b/dev-qt/qtquickcontrols2/Manifest index ac8be767fa71..50740dae5caa 100644 --- a/dev-qt/qtquickcontrols2/Manifest +++ b/dev-qt/qtquickcontrols2/Manifest @@ -1,6 +1,3 @@ -AUX qtquickcontrols2-5.14.2-account-for-scale-before-positioning.patch 2268 BLAKE2B e321a635cc94d92245291539d862aa1cfc63bc6a558d6ddc792800be409dff11b1777349aed394d0e9df5dbfae29cd71681271eda1c68745af3ec1e1e76eabed SHA512 6d559d5c128e0046319fb8d6bdd3914a30eae41315efd267e6271c3f69759024abb79c7cb3a604c8bb58936a2daf25fd1217ee877516b65b8d5262fd76dac39f -DIST qtquickcontrols2-everywhere-src-5.14.2.tar.xz 8153752 BLAKE2B d1803007fb016276b75db9102ebfd82a6afa279b845d3507a04b76c2ab6fc8345840f3ea76c12607ed2b7be11e2b2c26bb76ff84b65a4c8df7cf9c66dbd95003 SHA512 de8b669417c2d039c0f49e805be72e757877991bc3c7feb13417202a4964cb6391924837751c520ed6234930e90dfe00417ca1c369418b2cdf4f09da679ba722 DIST qtquickcontrols2-everywhere-src-5.15.1.tar.xz 8282444 BLAKE2B 94be5403a3642ceb1ce8eb7ceae2a116743f5ee75c0614448bbfb846918d108f3c5bb6ad881bb63eb30082f0bbeed28a49e32456d335e67f19dc65418c76216a SHA512 ecb75619e80b737e3ae214f65a5175d933f8dc7832eb4eccd469fc1cb1eb85ef5c47f81563165da2d75abf15d7c47b868e68ab758d95183371b4ef64e7c52a39 -EBUILD qtquickcontrols2-5.14.2-r1.ebuild 696 BLAKE2B eb186869701f065ef1b1f8bd3e51055bf796c388dd9f4511fbb5471911e193a0a9d451fcf3a1c1bde2699123420345c08c20ca6df221ea33cabc78b376fafada SHA512 c6103cf3fdabf9b9c105426032b0c41ee3397aa94363d098cc06e1abde3d1cd46591022c9d845b4c8a41eea3605eca126715b3e471c8623f55d2d4098c4932b4 -EBUILD qtquickcontrols2-5.15.1.ebuild 609 BLAKE2B 1406936acf30b318039b6616e2e91f0fce406aa4ac70566c4ace70105ab71325b436af86f8c9144adf2e928fa9257d47a6e2913c5f903ed53b48135d9593d7f3 SHA512 3e005ce1c3ffcf1090cea4d536bcd00328cb657cdefc9bb311bbf14fe072d7533b05b8cd41c66f0661feec85482883a01d3e52eb97da202e6513b6002448da93 +EBUILD qtquickcontrols2-5.15.1.ebuild 606 BLAKE2B 0d3d0105694c0a2be2ea02a6a4605dc3174de9535b4997f35a7dce5bb73ec782767e871e95ab1ff16103bc214eb9753b01085d1919827ad64d31b8cb6381f8bc SHA512 37a4182eb357133277b9e40af464ddf2d8cb0fd2a4990de23e986f5e764249e61a09674493042b13da62be44097fb3d717495161d771a99500241cd1db00fe0e MISC metadata.xml 551 BLAKE2B cbf6277d7f92518755cd42245a21869008fc6110a1e51d5ba6f8b0bf5c81634bd92300c0570d9f9fde58bb847a5ef47ce4f9fa9b0d88e4491589100274657495 SHA512 b3fd90ef9fffbd2bbfd8bd75ee09ff4dc7fb18a4ab7247a12c54c980993450466454a83938a2cbc7c423d9ddc03a46e8b29a92b443aa08166ab2fa2be2a3451c diff --git a/dev-qt/qtquickcontrols2/files/qtquickcontrols2-5.14.2-account-for-scale-before-positioning.patch b/dev-qt/qtquickcontrols2/files/qtquickcontrols2-5.14.2-account-for-scale-before-positioning.patch deleted file mode 100644 index ae54f12f3652..000000000000 --- a/dev-qt/qtquickcontrols2/files/qtquickcontrols2-5.14.2-account-for-scale-before-positioning.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 4df52eee2b40244ba1a3d115a43ed51cfd742105 Mon Sep 17 00:00:00 2001 -From: Andy Shaw <andy.shaw@qt.io> -Date: Thu, 7 Feb 2019 17:35:51 +0100 -Subject: [PATCH] Menu: account for the scale when getting the size before - positioning - -Fixes: QTBUG-73687 -Change-Id: Id2d6a6b5c6651337ab7ae26d07011160b79654bf -Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> ---- - src/quicktemplates2/qquickpopup.cpp | 1 + - src/quicktemplates2/qquickpopuppositioner.cpp | 14 +++++++------- - 3 files changed, 17 insertions(+), 15 deletions(-) - -diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp -index ecb2568ed..d108420ea 100644 ---- a/src/quicktemplates2/qquickpopup.cpp -+++ b/src/quicktemplates2/qquickpopup.cpp -@@ -471,6 +471,7 @@ void QQuickPopupPrivate::finalizeEnterTransition() - if (focus) - popupItem->setFocus(true); - transitionState = NoTransition; -+ getPositioner()->reposition(); - emit q->openedChanged(); - emit q->opened(); - } -diff --git a/src/quicktemplates2/qquickpopuppositioner.cpp b/src/quicktemplates2/qquickpopuppositioner.cpp -index ebd8ff294..dbe8ac1d5 100644 ---- a/src/quicktemplates2/qquickpopuppositioner.cpp -+++ b/src/quicktemplates2/qquickpopuppositioner.cpp -@@ -108,10 +108,11 @@ void QQuickPopupPositioner::reposition() - return; - } - -- const qreal w = popupItem->width(); -- const qreal h = popupItem->height(); -- const qreal iw = popupItem->implicitWidth(); -- const qreal ih = popupItem->implicitHeight(); -+ const qreal scale = popupItem->scale(); -+ const qreal w = popupItem->width() * scale; -+ const qreal h = popupItem->height() * scale; -+ const qreal iw = popupItem->implicitWidth() * scale; -+ const qreal ih = popupItem->implicitHeight() * scale; - - bool widthAdjusted = false; - bool heightAdjusted = false; -@@ -257,10 +258,9 @@ void QQuickPopupPositioner::reposition() - } - - if (!p->hasWidth && widthAdjusted && rect.width() > 0) -- popupItem->setWidth(rect.width()); -+ popupItem->setWidth(rect.width() / scale); - if (!p->hasHeight && heightAdjusted && rect.height() > 0) -- popupItem->setHeight(rect.height()); -- -+ popupItem->setHeight(rect.height() / scale); - m_positioning = false; - } - --- -2.16.3 diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.14.2-r1.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.14.2-r1.ebuild deleted file mode 100644 index 05d48cade927..000000000000 --- a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.14.2-r1.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit qt5-build - -DESCRIPTION="Set of next generation Qt Quick controls for the Qt5 framework" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" -fi - -IUSE="widgets" - -DEPEND=" - ~dev-qt/qtcore-${PV} - ~dev-qt/qtdeclarative-${PV} - ~dev-qt/qtgui-${PV} - widgets? ( ~dev-qt/qtwidgets-${PV} ) -" -RDEPEND="${DEPEND} - ~dev-qt/qtgraphicaleffects-${PV} -" - -PATCHES=( - "${FILESDIR}/${P}-account-for-scale-before-positioning.patch" # QTBUG-73687 -) - -src_prepare() { - qt_use_disable_mod widgets widgets \ - src/imports/platform/platform.pro - - qt5-build_src_prepare -} diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.1.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.1.ebuild index 90962415a9f5..d9241d146306 100644 --- a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.1.ebuild +++ b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.1.ebuild @@ -7,7 +7,7 @@ inherit qt5-build DESCRIPTION="Set of next generation Qt Quick controls for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" fi IUSE="widgets" |