diff options
-rw-r--r-- | src/corelib/tools/qpoint.h | 6 | ||||
-rw-r--r-- | src/gui/painting/qpaintengine_raster.cpp | 7 | ||||
-rw-r--r-- | src/gui/painting/qpaintengineex.cpp | 7 |
3 files changed, 0 insertions, 20 deletions
diff --git a/src/corelib/tools/qpoint.h b/src/corelib/tools/qpoint.h index c0cf2192c1..b394ece1a6 100644 --- a/src/corelib/tools/qpoint.h +++ b/src/corelib/tools/qpoint.h @@ -92,14 +92,8 @@ public: private: friend class QTransform; - // ### Qt 5; remove the ifdef and just have the same order on all platforms. -#if defined(Q_OS_MAC) - int yp; - int xp; -#else int xp; int yp; -#endif }; Q_DECLARE_TYPEINFO(QPoint, Q_MOVABLE_TYPE); diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp index 0a1b8bbd01..e2ce35af64 100644 --- a/src/gui/painting/qpaintengine_raster.cpp +++ b/src/gui/painting/qpaintengine_raster.cpp @@ -2006,15 +2006,8 @@ void QRasterPaintEngine::drawPolygon(const QPoint *points, int pointCount, Polyg if (s->penData.blend) { int count = pointCount * 2; QVarLengthArray<qreal> fpoints(count); - #ifdef Q_WS_MAC - for (int i=0; i<count; i+=2) { - fpoints[i] = ((int *) points)[i+1]; - fpoints[i+1] = ((int *) points)[i]; - } - #else for (int i=0; i<count; ++i) fpoints[i] = ((int *) points)[i]; - #endif QVectorPath vp((qreal *) fpoints.data(), pointCount, 0, QVectorPath::polygonFlags(mode)); if (s->flags.fast_pen) { diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp index 5105d9a963..9427dd5105 100644 --- a/src/gui/painting/qpaintengineex.cpp +++ b/src/gui/painting/qpaintengineex.cpp @@ -789,15 +789,8 @@ void QPaintEngineEx::drawLines(const QLine *lines, int lineCount) qreal pts[64]; int count2 = count<<1; -#ifdef Q_WS_MAC - for (int i=0; i<count2; i+=2) { - pts[i] = ((int *) lines)[i+1]; - pts[i+1] = ((int *) lines)[i]; - } -#else for (int i=0; i<count2; ++i) pts[i] = ((int *) lines)[i]; -#endif QVectorPath path(pts, count, qpaintengineex_line_types_16, QVectorPath::LinesHint); stroke(path, state()->pen); |