Commit 8c9507b0 authored by Albert Astals Cid's avatar Albert Astals Cid
Browse files

Merge remote-tracking branch 'origin/Applications/16.12'

parents 91f092cd af6e9a9b
......@@ -837,7 +837,7 @@ void PagePainter::paintCroppedPageOnPainter( QPainter * destPainter, const Okula
{
if ( limitsEnlarged.intersects( rect->boundingRect( scaledWidth, scaledHeight ).translated( -scaledCrop.topLeft() ) ) )
{
mixedPainter->strokePath( rect->region(), QPen( normalColor ) );
mixedPainter->strokePath( rect->region(), QPen( normalColor, 0 ) );
}
}
}
......
......@@ -71,8 +71,8 @@ class Q_DECL_EXPORT PagePainter
static void drawShapeOnImage(
QImage & image,
const NormalizedPath & imagePoints,
bool closeShape = true,
const QPen & pen = QPen(),
bool closeShape,
const QPen & pen,
const QBrush & brush = QBrush(),
double penWidthMultiplier = 1.0,
RasterOperation op = Normal
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment