From: Ivailo Monev Date: Mon, 29 Nov 2021 10:48:13 +0000 (+0200) Subject: QPenPrivate copy constructor for qAtomicDetach() X-Git-Tag: 4.12.0~1502 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=359ae27e6113fd21c391a6cc67647bad86b801fe;p=kde%2FKatie.git QPenPrivate copy constructor for qAtomicDetach() Signed-off-by: Ivailo Monev --- diff --git a/src/gui/painting/qpen.cpp b/src/gui/painting/qpen.cpp index 76e9fddc7..effe83f0f 100644 --- a/src/gui/painting/qpen.cpp +++ b/src/gui/painting/qpen.cpp @@ -206,13 +206,20 @@ QT_BEGIN_NAMESPACE /*! \internal */ -inline QPenPrivate::QPenPrivate(const QBrush &_brush, qreal _width, Qt::PenStyle penStyle, +QPenPrivate::QPenPrivate(const QBrush &_brush, qreal _width, Qt::PenStyle penStyle, Qt::PenCapStyle _capStyle, Qt::PenJoinStyle _joinStyle) : ref(1), width(_width), brush(_brush), style(penStyle), capStyle(_capStyle), joinStyle(_joinStyle), dashOffset(0), miterLimit(2), cosmetic(false) { } +QPenPrivate::QPenPrivate(const QPenPrivate &other) + : ref(1), width(other.width), brush(other.brush), style(other.style), capStyle(other.capStyle), + joinStyle(other.joinStyle), dashOffset(other.dashOffset), miterLimit(other.miterLimit), + cosmetic(other.cosmetic) +{ +} + static const Qt::PenCapStyle qpen_default_cap = Qt::SquareCap; static const Qt::PenJoinStyle qpen_default_join = Qt::BevelJoin; diff --git a/src/gui/painting/qpen_p.h b/src/gui/painting/qpen_p.h index 1838fe093..d6a5c4cae 100644 --- a/src/gui/painting/qpen_p.h +++ b/src/gui/painting/qpen_p.h @@ -41,6 +41,9 @@ class QPenPrivate { public: QPenPrivate(const QBrush &brush, qreal width, Qt::PenStyle, Qt::PenCapStyle, Qt::PenJoinStyle _joinStyle); + // for qAtomicDetach() + QPenPrivate(const QPenPrivate &other); + QAtomicInt ref; qreal width; QBrush brush;