From 8c1997ee8fba5ba6fd557997d8d9d5d6176858ee Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sat, 6 Nov 2021 19:14:21 +1000 Subject: [PATCH] qt6_base: bump version --- ...6.2.0.patchset => qt6_base-6.2.1.patchset} | 122 ++++++++++++++++++ ...ase-6.2.0.recipe => qt6_base-6.2.1.recipe} | 6 +- 2 files changed, 125 insertions(+), 3 deletions(-) rename dev-qt/qt6-base/patches/{qt6_base-6.2.0.patchset => qt6_base-6.2.1.patchset} (87%) rename dev-qt/qt6-base/{qt6_base-6.2.0.recipe => qt6_base-6.2.1.recipe} (98%) diff --git a/dev-qt/qt6-base/patches/qt6_base-6.2.0.patchset b/dev-qt/qt6-base/patches/qt6_base-6.2.1.patchset similarity index 87% rename from dev-qt/qt6-base/patches/qt6_base-6.2.0.patchset rename to dev-qt/qt6-base/patches/qt6_base-6.2.1.patchset index 5ed334d76..32fcf7391 100644 --- a/dev-qt/qt6-base/patches/qt6_base-6.2.0.patchset +++ b/dev-qt/qt6-base/patches/qt6_base-6.2.1.patchset @@ -1046,3 +1046,125 @@ index e06e7e8..e0bd23f 100644 -- 2.30.2 + +From 8ba3a2f911ad035b0847068bdde1ee87c93cf274 Mon Sep 17 00:00:00 2001 +From: Richard Moe Gustavsen +Date: Tue, 2 Nov 2021 09:02:45 +0100 +Subject: [PATCH] Revert "Code style fix" + +This reverts commit e1d7df5ce9eb1d370e1b6dcd31ced4029082d63d. + +The offending patch removed handling of page-up and page-down +shortcuts in QScrollView (including subclasses like QTextBrowser). + +Pick-to: 6.2 +Fixes: QTBUG-97908 +Fixes: QTBUG-90352 +Change-Id: If760e983a082edb53e12e1311e2c7f2676d80bb2 +Reviewed-by: Volker Hilsheimer +Reviewed-by: Liang Qi +--- + src/widgets/widgets/qabstractscrollarea.cpp | 82 ++++++++++++++++------------- + 1 file changed, 45 insertions(+), 37 deletions(-) + +diff --git a/src/widgets/widgets/qabstractscrollarea.cpp b/src/widgets/widgets/qabstractscrollarea.cpp +index 4ad8a3b4110..627dbaa1d6e 100644 +--- a/src/widgets/widgets/qabstractscrollarea.cpp ++++ b/src/widgets/widgets/qabstractscrollarea.cpp +@@ -1232,49 +1232,57 @@ void QAbstractScrollArea::contextMenuEvent(QContextMenuEvent *e) + void QAbstractScrollArea::keyPressEvent(QKeyEvent * e) + { + Q_D(QAbstractScrollArea); +- ++ if (false){ ++#ifndef QT_NO_SHORTCUT ++ } else if (e == QKeySequence::MoveToPreviousPage) { ++ d->vbar->triggerAction(QScrollBar::SliderPageStepSub); ++ } else if (e == QKeySequence::MoveToNextPage) { ++ d->vbar->triggerAction(QScrollBar::SliderPageStepAdd); ++#endif ++ } else { + #ifdef QT_KEYPAD_NAVIGATION +- if (QApplicationPrivate::keypadNavigationEnabled() && !hasEditFocus()) { +- e->ignore(); +- return; +- } ++ if (QApplicationPrivate::keypadNavigationEnabled() && !hasEditFocus()) { ++ e->ignore(); ++ return; ++ } + #endif +- switch (e->key()) { +- case Qt::Key_Up: +- d->vbar->triggerAction(QScrollBar::SliderSingleStepSub); +- break; +- case Qt::Key_Down: +- d->vbar->triggerAction(QScrollBar::SliderSingleStepAdd); +- break; +- case Qt::Key_Left: ++ switch (e->key()) { ++ case Qt::Key_Up: ++ d->vbar->triggerAction(QScrollBar::SliderSingleStepSub); ++ break; ++ case Qt::Key_Down: ++ d->vbar->triggerAction(QScrollBar::SliderSingleStepAdd); ++ break; ++ case Qt::Key_Left: + #ifdef QT_KEYPAD_NAVIGATION +- if (QApplicationPrivate::keypadNavigationEnabled() && hasEditFocus() +- && (!d->hbar->isVisible() || d->hbar->value() == d->hbar->minimum())) { +- //if we aren't using the hbar or we are already at the leftmost point ignore +- e->ignore(); +- return; +- } ++ if (QApplicationPrivate::keypadNavigationEnabled() && hasEditFocus() ++ && (!d->hbar->isVisible() || d->hbar->value() == d->hbar->minimum())) { ++ //if we aren't using the hbar or we are already at the leftmost point ignore ++ e->ignore(); ++ return; ++ } + #endif +- d->hbar->triggerAction( +- layoutDirection() == Qt::LeftToRight +- ? QScrollBar::SliderSingleStepSub : QScrollBar::SliderSingleStepAdd); +- break; +- case Qt::Key_Right: ++ d->hbar->triggerAction( ++ layoutDirection() == Qt::LeftToRight ++ ? QScrollBar::SliderSingleStepSub : QScrollBar::SliderSingleStepAdd); ++ break; ++ case Qt::Key_Right: + #ifdef QT_KEYPAD_NAVIGATION +- if (QApplicationPrivate::keypadNavigationEnabled() && hasEditFocus() +- && (!d->hbar->isVisible() || d->hbar->value() == d->hbar->maximum())) { +- //if we aren't using the hbar or we are already at the rightmost point ignore +- e->ignore(); +- return; +- } ++ if (QApplicationPrivate::keypadNavigationEnabled() && hasEditFocus() ++ && (!d->hbar->isVisible() || d->hbar->value() == d->hbar->maximum())) { ++ //if we aren't using the hbar or we are already at the rightmost point ignore ++ e->ignore(); ++ return; ++ } + #endif +- d->hbar->triggerAction( +- layoutDirection() == Qt::LeftToRight +- ? QScrollBar::SliderSingleStepAdd : QScrollBar::SliderSingleStepSub); +- break; +- default: +- e->ignore(); +- return; ++ d->hbar->triggerAction( ++ layoutDirection() == Qt::LeftToRight ++ ? QScrollBar::SliderSingleStepAdd : QScrollBar::SliderSingleStepSub); ++ break; ++ default: ++ e->ignore(); ++ return; ++ } + } + e->accept(); + } +-- +2.16.3 diff --git a/dev-qt/qt6-base/qt6_base-6.2.0.recipe b/dev-qt/qt6-base/qt6_base-6.2.1.recipe similarity index 98% rename from dev-qt/qt6-base/qt6_base-6.2.0.recipe rename to dev-qt/qt6-base/qt6_base-6.2.1.recipe index 8af03672c..666630bcd 100644 --- a/dev-qt/qt6-base/qt6_base-6.2.0.recipe +++ b/dev-qt/qt6-base/qt6_base-6.2.1.recipe @@ -8,9 +8,9 @@ COPYRIGHT="2015-2021 The Qt Company Ltd." LICENSE="GNU LGPL v3 GNU GPL v3 GNU FDL v1" -REVISION="3" +REVISION="1" SOURCE_URI="https://download.qt.io/official_releases/qt/${portVersion%.*}/$portVersion/submodules/qtbase-everywhere-src-$portVersion.tar.xz" -CHECKSUM_SHA256="fdfff0716d093bcb6bcd53746ce1d3c9701a6bf3326d47813866d43949b47769" +CHECKSUM_SHA256="2c5f07b5c3ea27d3fc1a46686ea3fb6724f94dddf1fb007de3eb0bdb87429079" SOURCE_DIR="qtbase-everywhere-src-$portVersion" srcGitRev2="5511f776f7235b5137badbb3c1acde2b8477f875" SOURCE_URI_2="https://github.com/threedeyes/qt6-haikuplugins/archive/$srcGitRev2.tar.gz" @@ -160,7 +160,7 @@ BUILD() INSTALL() { ninja -C build install - + # build platform plugins PATH=$PATH:$binDir:$libDir/Qt6 mkdir -p $sourceDir2/build $preferencesDir