From f02841dd5d4ba63c49fe0bcbf88182e2421371a2 Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Mon, 29 Apr 2024 10:14:24 +1000 Subject: [PATCH] Remove Q_DECL_DEPRECATED from constructor Even though this class is deprecated, this breaks the qt 6 on qt 6.7+ --- .../PyQt6/core/auto_generated/layout/qgslayouteffect.sip.in | 5 +---- python/core/auto_generated/layout/qgslayouteffect.sip.in | 5 +---- src/core/layout/qgslayouteffect.h | 4 +--- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/python/PyQt6/core/auto_generated/layout/qgslayouteffect.sip.in b/python/PyQt6/core/auto_generated/layout/qgslayouteffect.sip.in index d0618035fca..ef26a78dec2 100644 --- a/python/PyQt6/core/auto_generated/layout/qgslayouteffect.sip.in +++ b/python/PyQt6/core/auto_generated/layout/qgslayouteffect.sip.in @@ -26,12 +26,9 @@ onto a scene with custom composition modes. %End public: - QgsLayoutEffect() /Deprecated/; + QgsLayoutEffect(); %Docstring Constructor for QgsLayoutEffect. - -.. deprecated:: QGIS 3.34 - -- this class should not be used, it is non-stable and results in crashes. See https://bugreports.qt.io/browse/QTBUG-58501. %End void setCompositionMode( QPainter::CompositionMode mode ) /Deprecated/; diff --git a/python/core/auto_generated/layout/qgslayouteffect.sip.in b/python/core/auto_generated/layout/qgslayouteffect.sip.in index d0618035fca..ef26a78dec2 100644 --- a/python/core/auto_generated/layout/qgslayouteffect.sip.in +++ b/python/core/auto_generated/layout/qgslayouteffect.sip.in @@ -26,12 +26,9 @@ onto a scene with custom composition modes. %End public: - QgsLayoutEffect() /Deprecated/; + QgsLayoutEffect(); %Docstring Constructor for QgsLayoutEffect. - -.. deprecated:: QGIS 3.34 - -- this class should not be used, it is non-stable and results in crashes. See https://bugreports.qt.io/browse/QTBUG-58501. %End void setCompositionMode( QPainter::CompositionMode mode ) /Deprecated/; diff --git a/src/core/layout/qgslayouteffect.h b/src/core/layout/qgslayouteffect.h index 898c11dc81c..9b8c8bee19d 100644 --- a/src/core/layout/qgslayouteffect.h +++ b/src/core/layout/qgslayouteffect.h @@ -41,10 +41,8 @@ class CORE_EXPORT QgsLayoutEffect : public QGraphicsEffect /** * Constructor for QgsLayoutEffect. - * - * \deprecated since QGIS 3.34 -- this class should not be used, it is non-stable and results in crashes. See https://bugreports.qt.io/browse/QTBUG-58501. */ - Q_DECL_DEPRECATED QgsLayoutEffect() SIP_DEPRECATED = default; + QgsLayoutEffect() = default; /** * Sets the composition (blending) \a mode used for rendering