diff --git a/desktop/toolkit/qt5/polkit-qt/pspec.xml b/desktop/toolkit/qt5/polkit-qt/pspec.xml index 3359e1d414..b2158cc865 100755 --- a/desktop/toolkit/qt5/polkit-qt/pspec.xml +++ b/desktop/toolkit/qt5/polkit-qt/pspec.xml @@ -12,7 +12,7 @@ A library that allows developers to access PolicyKit API with a nice Qt-style API https://download.kde.org/stable/polkit-qt-1/polkit-qt-1-0.114.0.tar.xz - qt5-base-devel + qt5-base-devel glib2-devel polkit-devel mesa-devel @@ -25,7 +25,7 @@ polkit-qt - qt5-base + qt5-base glib2 polkit libgcc @@ -40,7 +40,7 @@ polkit-qt-devel polkit-qt - qt5-base-devel + qt5-base-devel glib2-devel polkit-devel @@ -51,6 +51,13 @@ + + 2023-10-07 + 0.114.0 + Rebuild. + Mustafa Cinasal + muscnsl@gmail.com + 2023-06-17 0.114.0 diff --git a/desktop/toolkit/qt5/qt5-declarative/files/qt_kde.patch b/desktop/toolkit/qt5/qt5-declarative/files/qt_kde.patch index 14c30e28c9..61b52ecd14 100644 --- a/desktop/toolkit/qt5/qt5-declarative/files/qt_kde.patch +++ b/desktop/toolkit/qt5/qt5-declarative/files/qt_kde.patch @@ -70,7 +70,7 @@ index 45150cfffd..5ad53faf95 100644 void BaselineJIT::generate_PushCatchContext(int index, int name) { as->pushCatchContext(index, name); } diff --git a/src/qml/jsruntime/qv4function.cpp b/src/qml/jsruntime/qv4function.cpp -index aeb4835c40..9082628a1a 100644 +index cf8a53cf9f..223e64271e 100644 --- a/src/qml/jsruntime/qv4function.cpp +++ b/src/qml/jsruntime/qv4function.cpp @@ -136,7 +136,7 @@ void Function::updateInternalClass(ExecutionEngine *engine, const QListmetaObjectForType(myTypeId); } diff --git a/src/qml/qml/qqmlvmemetaobject.cpp b/src/qml/qml/qqmlvmemetaobject.cpp -index aa9f4bc1bd..09503a7e99 100644 +index 1e0e4e419f..a0532d1794 100644 --- a/src/qml/qml/qqmlvmemetaobject.cpp +++ b/src/qml/qml/qqmlvmemetaobject.cpp -@@ -254,7 +254,7 @@ void QQmlVMEMetaObjectEndpoint::tryConnect() +@@ -251,7 +251,7 @@ void QQmlVMEMetaObjectEndpoint::tryConnect() if (!pd) return; @@ -466,10 +466,10 @@ index aa9f4bc1bd..09503a7e99 100644 } diff --git a/src/qml/types/qqmlconnections.cpp b/src/qml/types/qqmlconnections.cpp -index 29ed62cd39..aba930dfe1 100644 +index 4a4e6ce12c..a5889b7396 100644 --- a/src/qml/types/qqmlconnections.cpp +++ b/src/qml/types/qqmlconnections.cpp -@@ -338,7 +338,7 @@ void QQmlConnections::connectSignalsToMethods() +@@ -341,7 +341,7 @@ void QQmlConnections::connectSignalsToMethods() && propName.at(2).isUpper()) { qmlWarning(this) << tr("Detected function \"%1\" in Connections element. " "This is probably intended to be a signal handler but no " @@ -738,6 +738,48 @@ index 8321fcfeed..383078b3b9 100644 drag->setMimeData(mimeData); if (pixmapLoader.isReady()) { +diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp +index ea357d819d..2634b68248 100644 +--- a/src/quick/items/qquickflickable.cpp ++++ b/src/quick/items/qquickflickable.cpp +@@ -2120,11 +2120,9 @@ void QQuickFlickable::setContentWidth(qreal w) + d->contentItem->setWidth(w); + d->hData.markExtentsDirty(); + // Make sure that we're entirely in view. +- if ((!d->pressed && !d->hData.moving && !d->vData.moving) || d->hData.dragging) { +- d->hData.contentPositionChangedExternallyDuringDrag = d->hData.dragging; ++ if (!d->pressed && !d->hData.moving && !d->vData.moving) { + d->fixupMode = QQuickFlickablePrivate::Immediate; + d->fixupX(); +- d->hData.contentPositionChangedExternallyDuringDrag = false; + } else if (!d->pressed && d->hData.fixingUp) { + d->fixupMode = QQuickFlickablePrivate::ExtentChanged; + d->fixupX(); +@@ -2151,11 +2149,9 @@ void QQuickFlickable::setContentHeight(qreal h) + d->contentItem->setHeight(h); + d->vData.markExtentsDirty(); + // Make sure that we're entirely in view. +- if ((!d->pressed && !d->hData.moving && !d->vData.moving) || d->vData.dragging) { +- d->vData.contentPositionChangedExternallyDuringDrag = d->vData.dragging; ++ if (!d->pressed && !d->hData.moving && !d->vData.moving) { + d->fixupMode = QQuickFlickablePrivate::Immediate; + d->fixupY(); +- d->vData.contentPositionChangedExternallyDuringDrag = false; + } else if (!d->pressed && d->vData.fixingUp) { + d->fixupMode = QQuickFlickablePrivate::ExtentChanged; + d->fixupY(); +diff --git a/src/quick/items/qquickflickable_p_p.h b/src/quick/items/qquickflickable_p_p.h +index d5d838eaea..aef15e150a 100644 +--- a/src/quick/items/qquickflickable_p_p.h ++++ b/src/quick/items/qquickflickable_p_p.h +@@ -120,6 +120,7 @@ public: + dragStartOffset = 0; + fixingUp = false; + inOvershoot = false; ++ contentPositionChangedExternallyDuringDrag = false; + } + + void markExtentsDirty() { diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index 33da9762d3..9e8b289376 100644 --- a/src/quick/items/qquickitem.cpp @@ -1318,7 +1360,7 @@ index 0000000000..8c63b09f81 + +#endif diff --git a/src/quickwidgets/qquickwidget.cpp b/src/quickwidgets/qquickwidget.cpp -index 39780f8de3..9c97b43518 100644 +index cf021d9a7c..b0117683f7 100644 --- a/src/quickwidgets/qquickwidget.cpp +++ b/src/quickwidgets/qquickwidget.cpp @@ -39,6 +39,7 @@ @@ -1381,7 +1423,7 @@ index 39780f8de3..9c97b43518 100644 QOpenGLContext *shareContext = qt_gl_global_share_context(); if (!shareContext) shareContext = QWidgetPrivate::get(q->window())->shareContext(); -@@ -1520,19 +1529,16 @@ bool QQuickWidget::event(QEvent *e) +@@ -1527,19 +1536,16 @@ bool QQuickWidget::event(QEvent *e) d->handleWindowChange(); break; @@ -1409,7 +1451,7 @@ index 39780f8de3..9c97b43518 100644 if (d->useSoftwareRenderer #if QT_CONFIG(opengl) -@@ -1545,7 +1551,7 @@ bool QQuickWidget::event(QEvent *e) +@@ -1552,7 +1558,7 @@ bool QQuickWidget::event(QEvent *e) d->render(true); } break; @@ -1634,18 +1676,18 @@ index 0000000000..bd88d14c76 + property var selfAsBroken: self as Broken +} diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp -index bffb62c59e..97cc64991f 100644 +index 1be1533b63..dfc82011c6 100644 --- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp +++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp -@@ -336,6 +336,7 @@ private slots: +@@ -337,6 +337,7 @@ private slots: void bareInlineComponent(); void hangOnWarning(); + void objectAsBroken(); void ambiguousContainingType(); - -@@ -5876,6 +5877,21 @@ void tst_qqmllanguage::ambiguousContainingType() + void staticConstexprMembers(); +@@ -5939,6 +5940,21 @@ void tst_qqmllanguage::bindingAliasToComponentUrl() } } @@ -1667,6 +1709,32 @@ index bffb62c59e..97cc64991f 100644 QTEST_MAIN(tst_qqmllanguage) #include "tst_qqmllanguage.moc" +diff --git a/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp b/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp +index d092cd0170..62f7c67dd4 100644 +--- a/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp ++++ b/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp +@@ -2642,7 +2642,12 @@ void tst_qquickflickable::setContentPositionWhileDragging() // QTBUG-104966 + } else if (newExtent >= 0) { + // ...or reduce the content size be be less than current (contentX, contentY) position + // This forces the content item to move. +- expectedContentPos = moveDelta; ++ // contentY: 150 ++ // 320 - 150 = 170 pixels down to bottom ++ // Now reduce contentHeight to 200 ++ // since we are at the bottom, and the flickable is 100 pixels tall, contentY must land ++ // at newExtent - 100. ++ + if (isHorizontal) { + flickable->setContentWidth(newExtent); + } else { +@@ -2652,6 +2657,7 @@ void tst_qquickflickable::setContentPositionWhileDragging() // QTBUG-104966 + // We therefore cannot scroll/flick it further down. Drag it up towards the top instead + // (by moving mouse down). + pos += moveDelta; ++ expectedContentPos = unitDelta * (newExtent - (isHorizontal ? flickable->width() : flickable->height())); + } + + QTest::mouseMove(window.data(), pos); diff --git a/tests/auto/quick/qquickgridview/data/qtbug86255.qml b/tests/auto/quick/qquickgridview/data/qtbug86255.qml new file mode 100644 index 0000000000..20688b1967 diff --git a/desktop/toolkit/qt5/qt5-declarative/pspec.xml b/desktop/toolkit/qt5/qt5-declarative/pspec.xml index 090faaae8f..c66961575f 100755 --- a/desktop/toolkit/qt5/qt5-declarative/pspec.xml +++ b/desktop/toolkit/qt5/qt5-declarative/pspec.xml @@ -11,15 +11,15 @@ Classes for QML and JavaScript languages Classes for QML and JavaScript languages LGPLv2.1-linking-exception - http://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtdeclarative-everywhere-opensource-src-5.15.10.tar.xz + http://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qtdeclarative-everywhere-opensource-src-5.15.11.tar.xz python3 - qt5-base-devel + qt5-base-devel libxkbcommon-devel mesa-devel - - - qt5-sql-sqlite + + + qt5-sql-sqlite qt_kde.patch @@ -31,9 +31,9 @@ libgcc - qt5-base + qt5-base libglvnd - + /usr/lib @@ -53,7 +53,7 @@ /usr/include/qt5 - qt5-base-devel + qt5-base-devel qt5-declarative @@ -61,7 +61,7 @@ + + 2023-10-07 + 5.15.11 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2023-09-08 5.15.10 diff --git a/desktop/toolkit/qt5/qt5-networkauth/pspec.xml b/desktop/toolkit/qt5/qt5-networkauth/pspec.xml index f14d7a1a38..65e3acdd5b 100644 --- a/desktop/toolkit/qt5/qt5-networkauth/pspec.xml +++ b/desktop/toolkit/qt5/qt5-networkauth/pspec.xml @@ -12,16 +12,16 @@ app:gui Network authentication module Ağ kimlik doğrulama modülü - http://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtnetworkauth-everywhere-opensource-src-5.15.10.tar.xz + http://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qtnetworkauth-everywhere-opensource-src-5.15.11.tar.xz - qt5-base-devel + qt5-base-devel qt5-networkauth - qt5-base + qt5-base /usr/lib @@ -34,7 +34,7 @@ Development files for qt5-networkauth qt5-networkauth - qt5-base-devel + qt5-base-devel /usr/include @@ -44,6 +44,13 @@ + + 2023-10-07 + 5.15.11 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2023-06-17 5.15.10 diff --git a/desktop/toolkit/qt5/qt5-speech/pspec.xml b/desktop/toolkit/qt5/qt5-speech/pspec.xml index fffbeb121d..ccd76ccf54 100755 --- a/desktop/toolkit/qt5/qt5-speech/pspec.xml +++ b/desktop/toolkit/qt5/qt5-speech/pspec.xml @@ -14,10 +14,10 @@ LGPL3 Qt module to make text to speech and speech recognition easy Qt module to make text to speech and speech recognition easy - http://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtspeech-everywhere-opensource-src-5.15.10.tar.xz + http://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qtspeech-everywhere-opensource-src-5.15.11.tar.xz flite-devel - qt5-base-devel + qt5-base-devel speech-dispatcher-devel @@ -29,7 +29,7 @@ Qt module to make text to speech and speech recognition easy flite - qt5-base + qt5-base libgcc speech-dispatcher @@ -54,6 +54,13 @@ + + 2023-10-07 + 5.15.11 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2023-06-17 5.15.10