diff options
Diffstat (limited to 'dev-qt/qtdeclarative')
5 files changed, 2 insertions, 268 deletions
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest index 3960dc10f693..9c5d8c8cc49c 100644 --- a/dev-qt/qtdeclarative/Manifest +++ b/dev-qt/qtdeclarative/Manifest @@ -1,10 +1,6 @@ -AUX qtdeclarative-5.13.2-fix-deadlock-on-exit.patch 4042 BLAKE2B 9ad28ad2e9157d63e18da3c807db8f6c7909a87e82d4798ac7c5ada592a0527f44223cb94f6cf527f7fb34e3e2f3bd6fcf250a44b420500a4d3b4bf7d5ece586 SHA512 6a0d8f3b3d9cc53c23d8ca5942b266d95d1d94a1045d7125c97e23724522913d94bf8b8430d501a2a1f8d39a50f74cf673a63ce5437caa582cfe12e7b525ad9b -AUX qtdeclarative-5.13.2-read-QQmlPropertyMap-correctly.patch 3348 BLAKE2B 54a263b72e7010271b5ce2fd8ed687ce19270cdf27029ea515a34795b036cae8f582e6f7b1ffcb815be660ac81f1b53b93918c3bda098f614cbc3b51ea80bb60 SHA512 e71ddab29cf35fa4cb1334147b1c5b6771860e68fd1e2e4958fb6cfb1489c567b0d209dfa1ba5e56119e5a61ee2039e8f3af75bd410ab187c2d61ac74a8c0b35 AUX qtdeclarative-5.4.2-disable-jit.patch 547 BLAKE2B 3f9cc85ab9ec7c2b79aad8bcbfe541ba51745f62e3f02111a2f455c6d1a7959c7980284e3a655ce8335d4a166d65570f2b9d236c681d155c015cc14dc3bb54af SHA512 cd410c0e731a1e096bd8a77b7ecc769a5e3503f7a2f12668f2f4f1c3099973eaa2060d97708962e422c580ee76ee3db3712834cd994b7e1aeeb57c0a4c3b0b3d -DIST qtdeclarative-everywhere-src-5.13.2.tar.xz 20940748 BLAKE2B acc688691a86318478a3f016821bf6e84ba3a552e4f8613414a51ecde8e588783ed80e53eed31bbc321945950754991d20a29290e9cf3b878c5415d1049be3cc SHA512 a3fcc65eccdd598c03991978db6462293781abc80affd9a489253d4a812073832554892d503fa0de32a9ef97ddc74b9ad71e2bd7cfa2f21ce1fc64d1358ab730 DIST qtdeclarative-everywhere-src-5.14.1.tar.xz 21299728 BLAKE2B dfa0dfc95956f9c9eeb6b790e0221cf745b0cefd89fc070caa741b9cdc644acd990128affbcef6ac585758a02f94b1693ccca77d9de080f04f4d1b6d2304537f SHA512 70094d24a977a5ae4a3a11ee31e49234592faca1ec8195560977e7834778d1b1fdc2a30e555dc6c43c98cef2a39d5c1bf6351093c0f46b9b22b4127f3bebef58 DIST qtdeclarative-everywhere-src-5.14.2.tar.xz 21305980 BLAKE2B 0ccbae8ddc46f4891af6732a4b3cf874c523c7ded5a06f78c7c5cd290fef8e32ad6efe5dcffe947024144128ab2f1108594e4a30da9ca79e1ce3008c73ca2a25 SHA512 48d3a547237514a8bdc2a4c0b3f97732abceacece0e0899d2f33787293eb99f54c28efce35a34b8c46dcd4d78ebbc88bfc820bc68496076eacace40aaceee004 -EBUILD qtdeclarative-5.13.2-r2.ebuild 1273 BLAKE2B 3198750bbd5d219f909223b8ddcd0c187f6e31d5489c67eb6c00f2c747040c7b93b5f1c2317b000dc89b8acf7bfa9bbcb1227e8b1528dd3bea5fa281be84f0b4 SHA512 5ea00b455cdb92ee5a3418e2ba18300c4e77bcc9c536cde02812754d0cb2276c4f5fc8592868b52aa2521debe8bcea83eef5a267660d61ea3ae3f6d5f700177e EBUILD qtdeclarative-5.14.1-r2.ebuild 1178 BLAKE2B 7f39248777ab4d62393d935318575fb69473e50b2a5794015ed5f5ce8adfa0012f60cd174e512f7aff76aaf27d568ececc8a2fb7051117f2ee690e71b5067af4 SHA512 f86b6074b37a635d1fb53b7c94ab47ba6a8558a9cf2a49f9ffc7821e8f507be6ab4972f8a14fd6fde89395f004bd3f277b68ec27c90eddd386ad91ea8ce7dff4 -EBUILD qtdeclarative-5.14.2.ebuild 1190 BLAKE2B 674b96f1bf9ab7e675644561be68edf885d7dda7d7fb5a37550d68384ed9eb939d726dd8a1992f0caad1d220ffdc5e1cbe707cb3d69bf85cbe76f612b3d049a3 SHA512 3d0c2134af6d7bee98ef5c2bfe34f26d7f0a0091d9fcae452d1cff3cf3e144fe4203ae43a2585f290848ddd67aebc9808a6ed8a5c712abe780a166ab103d5694 +EBUILD qtdeclarative-5.14.2.ebuild 1188 BLAKE2B 8ac2d33ed385990e892dfaf8198d75875a77dee5ec493a41b02dd87a4fdf9fb347c50b635dbeb698e978d0283abbf07a0eb1071f4e05b7da44d5468f9f3eca50 SHA512 20f724f73cc3b57fc51cb228fa86170569d3df3eac0dba11e6b857d15d3e04a4ba8e52d96cc53c94e7d660bcb9f0c40cc95408ee27fa7cc300e195bebf759c75 MISC metadata.xml 700 BLAKE2B 80c5bfdd7c6acd05795c20b36d062b76458fc4b3f83835eef83ed2f304e70dbae9dfe81908bf33e41fd944de4cc754e5f839451cf4c8ef4f06063817730b7cf6 SHA512 f1fbc57d96dc5b481d08da8c73ab9d1e183045ecefeb075a7ee8f1d6733583589077e3650ad5b2d52e4cafc67bf0894ae62fd4500e1974053e46d6a89377f3fd diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-5.13.2-fix-deadlock-on-exit.patch b/dev-qt/qtdeclarative/files/qtdeclarative-5.13.2-fix-deadlock-on-exit.patch deleted file mode 100644 index 09c4ad831c54..000000000000 --- a/dev-qt/qtdeclarative/files/qtdeclarative-5.13.2-fix-deadlock-on-exit.patch +++ /dev/null @@ -1,112 +0,0 @@ -From 73ad6e87bbeceea5830ab3a6b3dc66fa99e30f45 Mon Sep 17 00:00:00 2001 -From: Fabian Kosmale <fabian.kosmale@qt.io> -Date: Mon, 28 Oct 2019 13:41:11 +0100 -Subject: [PATCH] QQuickItem::setParentItem: add child earlier - -Calling (de)refWindow can trigger QQuickItem::windowChanged, which in turn -can call a user defined windowChanged handler. If that signal handler -were to call setParentItem, we would encounter an inconsistent state: -The item already has its parent set, but that parent would lack the item -in its children list (as we would only call refWindow at a later point). - -Fixes: QTBUG-79573 -Fixes: QTBUG-73439 -Change-Id: I46adaa54a0521b5cd7f37810b3dd1a206e6a09c6 -Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> ---- - src/quick/items/qquickitem.cpp | 21 +++++++++++++++++---- - .../qquickitem/data/setParentInWindowChange.qml | 12 ++++++++++++ - tests/auto/quick/qquickitem/tst_qquickitem.cpp | 8 ++++++++ - 3 files changed, 37 insertions(+), 4 deletions(-) - create mode 100644 tests/auto/quick/qquickitem/data/setParentInWindowChange.qml - -diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp -index 396012e1e67..26f02aeed7f 100644 ---- a/src/quick/items/qquickitem.cpp -+++ b/src/quick/items/qquickitem.cpp -@@ -2748,22 +2748,35 @@ void QQuickItem::setParentItem(QQuickItem *parentItem) - } - - QQuickWindow *parentWindow = parentItem ? QQuickItemPrivate::get(parentItem)->window : nullptr; -+ bool alreadyAddedChild = false; - if (d->window == parentWindow) { - // Avoid freeing and reallocating resources if the window stays the same. - d->parentItem = parentItem; - } else { -- if (d->window) -- d->derefWindow(); -+ auto oldParentItem = d->parentItem; - d->parentItem = parentItem; -+ if (d->parentItem) { -+ QQuickItemPrivate::get(d->parentItem)->addChild(this); -+ alreadyAddedChild = true; -+ } -+ if (d->window) { -+ d->derefWindow(); -+ // as we potentially changed d->parentWindow above -+ // the check in derefWindow could not work -+ // thus, we redo it here with the old parent -+ if (!oldParentItem) { -+ QQuickWindowPrivate::get(d->window)->parentlessItems.remove(this); -+ } -+ } - if (parentWindow) - d->refWindow(parentWindow); - } - - d->dirty(QQuickItemPrivate::ParentChanged); - -- if (d->parentItem) -+ if (d->parentItem && !alreadyAddedChild) - QQuickItemPrivate::get(d->parentItem)->addChild(this); -- else if (d->window) -+ else if (d->window && !alreadyAddedChild) - QQuickWindowPrivate::get(d->window)->parentlessItems.insert(this); - - d->setEffectiveVisibleRecur(d->calcEffectiveVisible()); -diff --git a/tests/auto/quick/qquickitem/data/setParentInWindowChange.qml b/tests/auto/quick/qquickitem/data/setParentInWindowChange.qml -new file mode 100644 -index 00000000000..d68b7adb72a ---- /dev/null -+++ b/tests/auto/quick/qquickitem/data/setParentInWindowChange.qml -@@ -0,0 +1,12 @@ -+import QtQuick 2.12 -+ -+Rectangle { -+ width: 800 -+ height: 600 -+ Item { -+ id: it -+ onWindowChanged: () => it.parent = newParent -+ } -+ -+ Item { id: newParent } -+} -diff --git a/tests/auto/quick/qquickitem/tst_qquickitem.cpp b/tests/auto/quick/qquickitem/tst_qquickitem.cpp -index 7e132f97b67..9ce9766c925 100644 ---- a/tests/auto/quick/qquickitem/tst_qquickitem.cpp -+++ b/tests/auto/quick/qquickitem/tst_qquickitem.cpp -@@ -197,6 +197,8 @@ private slots: - void qtBug60123(); - #endif - -+ void setParentCalledInOnWindowChanged(); -+ - private: - - enum PaintOrderOp { -@@ -2145,6 +2147,12 @@ void tst_qquickitem::qtBug60123() - activateWindowAndTestPress(&window); - } - #endif -+void tst_qquickitem::setParentCalledInOnWindowChanged() -+{ -+ QQuickView view; -+ view.setSource(testFileUrl("setParentInWindowChange.qml")); -+ QVERIFY(ensureFocus(&view)); // should not crash -+} - - QTEST_MAIN(tst_qquickitem) - --- -2.16.3 diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-5.13.2-read-QQmlPropertyMap-correctly.patch b/dev-qt/qtdeclarative/files/qtdeclarative-5.13.2-read-QQmlPropertyMap-correctly.patch deleted file mode 100644 index 63f4235c9e7c..000000000000 --- a/dev-qt/qtdeclarative/files/qtdeclarative-5.13.2-read-QQmlPropertyMap-correctly.patch +++ /dev/null @@ -1,92 +0,0 @@ -From bcbc3c9cec1f7d7bb8c9d5f5ea94eb5c81ec2853 Mon Sep 17 00:00:00 2001 -From: Fabian Kosmale <fabian.kosmale@qt.io> -Date: Wed, 30 Oct 2019 10:15:23 +0100 -Subject: [PATCH] QQmlProperty: handle reads of QQmlPropertyMap correctly - -Fixes: QTBUG-79614 -Change-Id: Iaf84c0178dc88072a367da2b42b09554b85c7d57 -Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> ---- - src/qml/qml/qqmlproperty.cpp | 12 +++++++++--- - tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp | 21 +++++++++++++++++++++ - 2 files changed, 30 insertions(+), 3 deletions(-) - -diff --git a/src/qml/qml/qqmlproperty.cpp b/src/qml/qml/qqmlproperty.cpp -index c8166695bad..a394ed1ad9a 100644 ---- a/src/qml/qml/qqmlproperty.cpp -+++ b/src/qml/qml/qqmlproperty.cpp -@@ -63,6 +63,7 @@ - #include <private/qqmlvaluetypewrapper_p.h> - #include <QtCore/qdebug.h> - #include <cmath> -+#include <QtQml/QQmlPropertyMap> - - Q_DECLARE_METATYPE(QList<int>) - Q_DECLARE_METATYPE(QList<qreal>) -@@ -331,10 +332,15 @@ void QQmlPropertyPrivate::initProperty(QObject *obj, const QString &name) - - return; - } else { -- if (!property->isQObject()) -- return; // Not an object property -+ if (!property->isQObject()) { -+ if (auto asPropertyMap = qobject_cast<QQmlPropertyMap*>(currentObject)) -+ currentObject = asPropertyMap->value(path.at(ii).toString()).value<QObject*>(); -+ else -+ return; // Not an object property, and not a property map -+ } else { -+ property->readProperty(currentObject, ¤tObject); -+ } - -- property->readProperty(currentObject, ¤tObject); - if (!currentObject) return; // No value - - } -diff --git a/tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp b/tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp -index 27e06c6f674..ed213cd01aa 100644 ---- a/tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp -+++ b/tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp -@@ -37,6 +37,7 @@ - #include <QtCore/qdir.h> - #include <QtCore/private/qobject_p.h> - #include "../../shared/util.h" -+#include <QtQml/QQmlPropertyMap> - - #include <QDebug> - class MyQmlObject : public QObject -@@ -149,6 +150,8 @@ private slots: - void floatToStringPrecision(); - - void copy(); -+ -+ void nestedQQmlPropertyMap(); - private: - QQmlEngine engine; - }; -@@ -2106,6 +2109,24 @@ void tst_qqmlproperty::initTestCase() - qmlRegisterType<MyContainer>("Test",1,0,"MyContainer"); - } - -+void tst_qqmlproperty::nestedQQmlPropertyMap() -+{ -+ QQmlPropertyMap mainPropertyMap; -+ QQmlPropertyMap nestedPropertyMap; -+ QQmlPropertyMap deeplyNestedPropertyMap; -+ -+ mainPropertyMap.insert("nesting1", QVariant::fromValue(&nestedPropertyMap)); -+ nestedPropertyMap.insert("value", 42); -+ nestedPropertyMap.insert("nesting2", QVariant::fromValue(&deeplyNestedPropertyMap)); -+ deeplyNestedPropertyMap.insert("value", "success"); -+ -+ QQmlProperty value{&mainPropertyMap, "nesting1.value"}; -+ QCOMPARE(value.read().toInt(), 42); -+ -+ QQmlProperty success{&mainPropertyMap, "nesting1.nesting2.value"}; -+ QCOMPARE(success.read().toString(), QLatin1String("success")); -+} -+ - QTEST_MAIN(tst_qqmlproperty) - - #include "tst_qqmlproperty.moc" --- -2.16.3 diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.13.2-r2.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.13.2-r2.ebuild deleted file mode 100644 index eefc20c74e48..000000000000 --- a/dev-qt/qtdeclarative/qtdeclarative-5.13.2-r2.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 2009-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) -inherit python-any-r1 qt5-build - -DESCRIPTION="The QML and Quick modules for the Qt5 framework" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="arm" -fi - -IUSE="gles2-only +jit localstorage +widgets" - -BDEPEND="${PYTHON_DEPS}" -# qtgui[gles2-only=] is needed because of bug 504322 -DEPEND=" - ~dev-qt/qtcore-${PV} - ~dev-qt/qtgui-${PV}[gles2-only=] - ~dev-qt/qtnetwork-${PV} - ~dev-qt/qttest-${PV} - localstorage? ( ~dev-qt/qtsql-${PV} ) - widgets? ( ~dev-qt/qtwidgets-${PV}[gles2-only=] ) -" -RDEPEND="${DEPEND} - !<dev-qt/qtquickcontrols-5.7:5 -" - -PATCHES=( - "${FILESDIR}/${P}-read-QQmlPropertyMap-correctly.patch" # QTBUG-79614 - "${FILESDIR}/${P}-fix-deadlock-on-exit.patch" # QTBUG-79573 -) - -src_prepare() { - use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch") - - qt_use_disable_mod localstorage sql \ - src/imports/imports.pro - - qt_use_disable_mod widgets widgets \ - src/src.pro \ - src/qmltest/qmltest.pro \ - tests/auto/auto.pro \ - tools/tools.pro \ - tools/qmlscene/qmlscene.pro \ - tools/qml/qml.pro - - qt5-build_src_prepare -} - -src_configure() { - local myqmakeargs=( - -- - -qml-debug - ) - qt5-build_src_configure -} diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.14.2.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.14.2.ebuild index 5e3c49a6f3ca..9a43f954fada 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.14.2.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.14.2.ebuild @@ -8,7 +8,7 @@ inherit python-any-r1 qt5-build DESCRIPTION="The QML and Quick modules for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" + KEYWORDS="~amd64 arm ~arm64 ~hppa ~ppc ppc64 ~sparc ~x86" fi IUSE="gles2-only +jit localstorage vulkan +widgets" |