Merge branch 'stable' into dev

Conflicts:
	qmake/generators/mac/pbuilder_pbx.cpp
	src/corelib/json/qjsonwriter.cpp
	src/corelib/kernel/qeventdispatcher_blackberry.cpp
	src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm

Change-Id: I24df576c4cbd18fa51b03122f71e32bb83b9028f

1 files changed, 0 insertions, 55 deletions

diff --git a/src/gui/painting/qbezier.cpp b/src/gui/painting/qbezier.cpp
index 6cef7cc501..2762560da7 100644
--- a/src/gui/painting/qbezier.cpp
+++ b/src/gui/painting/qbezier.cpp
@@ -150,33 +150,6 @@ static inline int quadraticRoots(qreal a, qreal b, qreal c,
     }
 }
 
-static inline bool findInflections(qreal a, qreal b, qreal c,
-                                   qreal *t1 , qreal *t2, qreal *tCups)
-{
-    qreal r1 = 0, r2 = 0;
-
-    short rootsCount = quadraticRoots(a, b, c, &r1, &r2);
-
-    if (rootsCount >= 1) {
-        if (r1 < r2) {
-            *t1 = r1;
-            *t2 = r2;
-        } else {
-            *t1 = r2;
-            *t2 = r1;
-        }
-        if (!qFuzzyIsNull(a))
-            *tCups = qreal(0.5) * (-b / a);
-        else
-            *tCups = 2;
-
-        return true;
-    }
-
-    return false;
-}
-
-
 void QBezier::addToPolygon(QPolygonF *polygon, qreal bezier_flattening_threshold) const
 {
     QBezier beziers[10];
@@ -531,34 +504,6 @@ static QDebug operator<<(QDebug dbg, const QBezier &bz)
 }
 #endif
 
-static inline void splitBezierAt(const QBezier &bez, qreal t,
-                                 QBezier *left, QBezier *right)
-{
-    left->x1 = bez.x1;
-    left->y1 = bez.y1;
-
-    left->x2 = bez.x1 + t * ( bez.x2 - bez.x1 );
-    left->y2 = bez.y1 + t * ( bez.y2 - bez.y1 );
-
-    left->x3 = bez.x2 + t * ( bez.x3 - bez.x2 ); // temporary holding spot
-    left->y3 = bez.y2 + t * ( bez.y3 - bez.y2 ); // temporary holding spot
-
-    right->x3 = bez.x3 + t * ( bez.x4 - bez.x3 );
-    right->y3 = bez.y3 + t * ( bez.y4 - bez.y3 );
-
-    right->x2 = left->x3 + t * ( right->x3 - left->x3);
-    right->y2 = left->y3 + t * ( right->y3 - left->y3);
-
-    left->x3 = left->x2 + t * ( left->x3 - left->x2 );
-    left->y3 = left->y2 + t * ( left->y3 - left->y2 );
-
-    left->x4 = right->x1 = left->x3 + t * (right->x2 - left->x3);
-    left->y4 = right->y1 = left->y3 + t * (right->y2 - left->y3);
-
-    right->x4 = bez.x4;
-    right->y4 = bez.y4;
-}
-
 qreal QBezier::length(qreal error) const
 {
     qreal length = qreal(0.0);