whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove unused variables and parameters to fix compilation with g++-10.2 

The changes in 94dd2cebdc,
"Remove Qt4Compatible painting" left some unused variables and
parameters. This leads to warnings which are treted as errors and
thus inhibit a successful build with g++-10.2. This patch removes
them and thus enables building with g++-10.2 again.

Change-Id: I5f83aa8ec8706c3e783540f5116f455ea8fe44c2
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
bb10
Andreas Buhr 2020-11-12 15:54:07 +01:00
parent 1c56ff73aa
commit c87692a48b
4 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/painting/qpaintengine_raster.cpp
View File

@ -1681,8 +1681,6 @@ void QRasterPaintEngine::stroke(const QVectorPath &path, const QPen &pen)
QRect QRasterPaintEngine::toNormalizedFillRect(const QRectF &rect)
{
QRasterPaintEngineState *s = state();
int x1 = qRound(rect.x());
int y1 = qRound(rect.y());
int x2 = qRound(rect.right());

2
src/gui/painting/qpdf.cpp
View File

@ -649,7 +649,7 @@ QPdf::Stroker::Stroker()
basicStroker.setStrokeWidth(.1);
}
void QPdf::Stroker::setPen(const QPen &pen, QPainter::RenderHints hints)
void QPdf::Stroker::setPen(const QPen &pen, QPainter::RenderHints)
{
if (pen.style() == Qt::NoPen) {
stroker = nullptr;

4
src/gui/painting/qtriangulatingstroker.cpp
View File

@ -79,7 +79,7 @@ static inline void skipDuplicatePoints(const qreal **pts, const qreal *endPts)
}
}
void QTriangulatingStroker::process(const QVectorPath &path, const QPen &pen, const QRectF &, QPainter::RenderHints hints)
void QTriangulatingStroker::process(const QVectorPath &path, const QPen &pen, const QRectF &, QPainter::RenderHints)
{
const qreal *pts = path.points();
const QPainterPath::ElementType *types = path.elements();
@ -537,7 +537,7 @@ QDashedStrokeProcessor::QDashedStrokeProcessor()
m_dash_stroker.setCubicToHook(qdashprocessor_cubicTo);
}
void QDashedStrokeProcessor::process(const QVectorPath &path, const QPen &pen, const QRectF &clip, QPainter::RenderHints hints)
void QDashedStrokeProcessor::process(const QVectorPath &path, const QPen &pen, const QRectF &clip, QPainter::RenderHints)
{
const qreal *pts = path.points();

2
src/printsupport/kernel/qpaintengine_alpha.cpp
View File

@ -407,8 +407,6 @@ QAlphaPaintEnginePrivate::~QAlphaPaintEnginePrivate()
QRectF QAlphaPaintEnginePrivate::addPenWidth(const QPainterPath &path)
{
Q_Q(QAlphaPaintEngine);
QPainterPath tmp = path;
if (m_pen.style() == Qt::NoPen)