summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIonen Wolkens <ionen@gentoo.org>2023-09-20 02:57:05 -0400
committerIonen Wolkens <ionen@gentoo.org>2023-09-20 04:14:54 -0400
commit8768e1a03ee5dc728c3ad8dc251bbeedc149434c (patch)
tree2e2e139502e3dc89c2b6d914ab9c29d0d764e90e /dev-qt/qt-creator
parentdev-qt/qtbase: adjust comment (diff)
downloadgentoo-8768e1a03ee5dc728c3ad8dc251bbeedc149434c.tar.gz
gentoo-8768e1a03ee5dc728c3ad8dc251bbeedc149434c.tar.bz2
gentoo-8768e1a03ee5dc728c3ad8dc251bbeedc149434c.zip
dev-qt/qt-creator: link to upstream's fix in the qt653 patch header
It would probably be fine to pull that instead, albeit without looking closer it may be safer to keep as-is until next version. Note that while upstream's fix removes the private API usage for that bit, it still uses QtQuick3D private API for other things, so binding operator needs to stay. Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Diffstat (limited to 'dev-qt/qt-creator')
-rw-r--r--dev-qt/qt-creator/files/qt-creator-11.0.2-qt653.patch9
1 files changed, 7 insertions, 2 deletions
diff --git a/dev-qt/qt-creator/files/qt-creator-11.0.2-qt653.patch b/dev-qt/qt-creator/files/qt-creator-11.0.2-qt653.patch
index 1ad23a207d9b..7cbfc534bab6 100644
--- a/dev-qt/qt-creator/files/qt-creator-11.0.2-qt653.patch
+++ b/dev-qt/qt-creator/files/qt-creator-11.0.2-qt653.patch
@@ -1,5 +1,10 @@
-Uses private parts of the QtQuick3D api which added a namespace in:
-https://github.com/qt/qtquick3d/commit/2b139225745a94ab4fa7e30f28cd0207469ee68e
+Uses private parts of the QtQuick3D api which added a namespace in [1].
+
+Update: upstream has done a better fix in [2] (but can stick to the
+simple version check until next release).
+
+[1] https://github.com/qt/qtquick3d/commit/2b139225745a94ab4fa7e30f28cd0207469ee68e
+[2] https://github.com/qt-creator/qt-creator/commit/291e3096cd5d0763370238252143c3bb4fe93839
--- a/src/tools/qml2puppet/qml2puppet/editor3d/generalhelper.cpp
+++ b/src/tools/qml2puppet/qml2puppet/editor3d/generalhelper.cpp
@@ -803,5 +803,9 @@