diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-08-04 18:01:51 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-08-04 18:01:51 (GMT) |
| commit | 884c9b8b04639faf445917f7e1b7dfe4cc7724e2 (patch) | |
| tree | 6736d206e3227d80d8cb201390ed87fc2186b17c /src | |
| parent | e8b116e793d13204fb00b286becf95d2a933a784 (diff) | |
| parent | 08d09a78d3faf8b211e78cb63285c35c5544b5fc (diff) | |
| download | Qt-884c9b8b04639faf445917f7e1b7dfe4cc7724e2.zip Qt-884c9b8b04639faf445917f7e1b7dfe4cc7724e2.tar.gz Qt-884c9b8b04639faf445917f7e1b7dfe4cc7724e2.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/debugger/qpacketprotocol.cpp | 2 | ||||
| -rw-r--r-- | src/gui/painting/qpaintengineex.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/debugger/qpacketprotocol.cpp b/src/declarative/debugger/qpacketprotocol.cpp index 878f42f..c2f7709 100644 --- a/src/declarative/debugger/qpacketprotocol.cpp +++ b/src/declarative/debugger/qpacketprotocol.cpp @@ -125,7 +125,7 @@ public: QObject::connect(this, SIGNAL(invalidPacket()), parent, SIGNAL(invalidPacket())); QObject::connect(dev, SIGNAL(readyRead()), - this, SLOT(readyToRead())); + this, SLOT(readyToRead()), Qt::QueuedConnection); QObject::connect(dev, SIGNAL(aboutToClose()), this, SLOT(aboutToClose())); QObject::connect(dev, SIGNAL(bytesWritten(qint64)), diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp index e0746fb..881bd6e 100644 --- a/src/gui/painting/qpaintengineex.cpp +++ b/src/gui/painting/qpaintengineex.cpp @@ -831,7 +831,7 @@ void QPaintEngineEx::drawEllipse(const QRectF &r) int point_count = 0; x.points[0] = qt_curves_for_arc(r, 0, -360, x.points + 1, &point_count); - QVectorPath vp((qreal *) pts, 13, qpaintengineex_ellipse_types, QVectorPath::EllipseHint); + QVectorPath vp((qreal *) pts, point_count, qpaintengineex_ellipse_types, QVectorPath::EllipseHint); draw(vp); } |