diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-24 09:49:07 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-09-24 12:04:52 +0200 |
commit | c96426f19f8c244c0f5748f0009016f576db9616 (patch) | |
tree | f6365344e8a24415e7a67694af2f0c043bb0dae6 /src/gui/painting | |
parent | 2137cb7dc5c902ce71855901c83c4c9d87b1ce2d (diff) | |
parent | c5a3e5edd9e63b18abf1838c86a27a662224b02c (diff) |
Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4
Diffstat (limited to 'src/gui/painting')
-rw-r--r-- | src/gui/painting/qblittable_p.h | 11 | ||||
-rw-r--r-- | src/gui/painting/qcosmeticstroker.cpp | 8 | ||||
-rw-r--r-- | src/gui/painting/qcosmeticstroker_p.h | 11 | ||||
-rw-r--r-- | src/gui/painting/qpaintengine_blitter_p.h | 11 |
4 files changed, 37 insertions, 4 deletions
diff --git a/src/gui/painting/qblittable_p.h b/src/gui/painting/qblittable_p.h index 0f846741b3..b13b793a3d 100644 --- a/src/gui/painting/qblittable_p.h +++ b/src/gui/painting/qblittable_p.h @@ -42,6 +42,17 @@ #ifndef QBLITTABLE_P_H #define QBLITTABLE_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QtCore/qsize.h> #include <QtGui/private/qpixmap_blitter_p.h> diff --git a/src/gui/painting/qcosmeticstroker.cpp b/src/gui/painting/qcosmeticstroker.cpp index a2301e3cd8..926a1696b0 100644 --- a/src/gui/painting/qcosmeticstroker.cpp +++ b/src/gui/painting/qcosmeticstroker.cpp @@ -533,8 +533,8 @@ void QCosmeticStroker::drawPath(const QVectorPath &path) QPointF p = QPointF(points[0], points[1]) * state->matrix; patternOffset = state->lastPen.dashOffset()*64; - lastPixel.x = -1; - lastPixel.y = -1; + lastPixel.x = INT_MIN; + lastPixel.y = INT_MIN; bool closed; const QPainterPath::ElementType *e = subPath(type, end, points, &closed); @@ -588,8 +588,8 @@ void QCosmeticStroker::drawPath(const QVectorPath &path) QPointF p = QPointF(points[0], points[1]) * state->matrix; QPointF movedTo = p; patternOffset = state->lastPen.dashOffset()*64; - lastPixel.x = -1; - lastPixel.y = -1; + lastPixel.x = INT_MIN; + lastPixel.y = INT_MIN; const qreal *begin = points; const qreal *end = points + 2*path.elementCount(); diff --git a/src/gui/painting/qcosmeticstroker_p.h b/src/gui/painting/qcosmeticstroker_p.h index 5fc3559da4..84e22b2653 100644 --- a/src/gui/painting/qcosmeticstroker_p.h +++ b/src/gui/painting/qcosmeticstroker_p.h @@ -42,6 +42,17 @@ #ifndef QCOSMETICSTROKER_P_H #define QCOSMETICSTROKER_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <private/qdrawhelper_p.h> #include <private/qvectorpath_p.h> #include <private/qpaintengine_raster_p.h> diff --git a/src/gui/painting/qpaintengine_blitter_p.h b/src/gui/painting/qpaintengine_blitter_p.h index 56661a7d90..72dba8e49e 100644 --- a/src/gui/painting/qpaintengine_blitter_p.h +++ b/src/gui/painting/qpaintengine_blitter_p.h @@ -42,6 +42,17 @@ #ifndef QPAINTENGINE_BLITTER_P_H #define QPAINTENGINE_BLITTER_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include "private/qpaintengine_raster_p.h" #ifndef QT_NO_BLITTABLE |