diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-11-10 12:34:22 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-11-12 08:31:18 +0100 |
| commit | 94dd2cebdcb9446626cd32a00086431eb11ab2a4 (patch) | |
| tree | 00e549cc499e2b07dc7ec20139a4f9521822b386 /src/plugins | |
| parent | 85fe4c89835d862db30b43c775d8863fcf896f20 (diff) | |
Remove Qt4Compatible painting
Change-Id: Ie54206ca9b509875568f2158e229fca9cb1860a2
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/xcb/nativepainting/qpaintengine_x11.cpp | 8 |
2 files changed, 2 insertions, 8 deletions
diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.cpp b/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.cpp index 028344a37d..9ff107e7df 100644 --- a/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.cpp +++ b/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.cpp @@ -546,7 +546,7 @@ public: if (newPen.widthF() == 0) props.transformType = D2D1_STROKE_TRANSFORM_TYPE_HAIRLINE; - else if (qt_pen_is_cosmetic(newPen, q->state()->renderHints)) + else if (newPen.isCosmetic()) props.transformType = D2D1_STROKE_TRANSFORM_TYPE_FIXED; else props.transformType = D2D1_STROKE_TRANSFORM_TYPE_NORMAL; diff --git a/src/plugins/platforms/xcb/nativepainting/qpaintengine_x11.cpp b/src/plugins/platforms/xcb/nativepainting/qpaintengine_x11.cpp index e69030ca97..ef22efa164 100644 --- a/src/plugins/platforms/xcb/nativepainting/qpaintengine_x11.cpp +++ b/src/plugins/platforms/xcb/nativepainting/qpaintengine_x11.cpp @@ -150,17 +150,11 @@ public: || (render_hints & QPainter::Antialiasing); } void decideCoordAdjust() { - adjust_coords = !(render_hints & QPainter::Antialiasing) - && (render_hints & QPainter::Qt4CompatiblePainting) - && (has_alpha_pen - || (has_alpha_brush && has_pen && !has_alpha_pen) - || (cpen.style() > Qt::SolidLine)); + adjust_coords = false; } void clipPolygon_dev(const QPolygonF &poly, QPolygonF *clipped_poly); void systemStateChanged() override; inline bool isCosmeticPen() const { - if ((render_hints & QPainter::Qt4CompatiblePainting) && cpen == QPen()) - return true; return cpen.isCosmetic(); } |