summaryrefslogtreecommitdiffstats
path: root/tests/auto/qpainterpath
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-01-05 16:04:57 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-01-05 16:04:57 (GMT)
commit3a6bbedcea2b5ef15077a67c58e9e59abe904014 (patch)
treec2199f9faa005e5082e9fe419fea3b4e85e4c6e7 /tests/auto/qpainterpath
parent84b5bbc77045cdc267626ff86f309664283abed4 (diff)
parent8aa9c7638080e56b124f6542699c45dfbcbba2c0 (diff)
downloadQt-3a6bbedcea2b5ef15077a67c58e9e59abe904014.zip
Qt-3a6bbedcea2b5ef15077a67c58e9e59abe904014.tar.gz
Qt-3a6bbedcea2b5ef15077a67c58e9e59abe904014.tar.bz2
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'tests/auto/qpainterpath')
-rw-r--r--tests/auto/qpainterpath/tst_qpainterpath.cpp26
1 files changed, 26 insertions, 0 deletions
diff --git a/tests/auto/qpainterpath/tst_qpainterpath.cpp b/tests/auto/qpainterpath/tst_qpainterpath.cpp
index 19b3156..b701438 100644
--- a/tests/auto/qpainterpath/tst_qpainterpath.cpp
+++ b/tests/auto/qpainterpath/tst_qpainterpath.cpp
@@ -109,6 +109,7 @@ private slots:
void operators();
void connectPathDuplicatePoint();
+ void connectPathMoveTo();
void translate();
};
@@ -1182,6 +1183,31 @@ void tst_QPainterPath::connectPathDuplicatePoint()
QCOMPARE(c, a);
}
+void tst_QPainterPath::connectPathMoveTo()
+{
+ QPainterPath path1;
+ QPainterPath path2;
+ QPainterPath path3;
+ QPainterPath path4;
+
+ path1.moveTo(1,1);
+
+ path2.moveTo(4,4);
+ path2.lineTo(5,6);
+ path2.lineTo(6,7);
+
+ path3.connectPath(path2);
+
+ path4.lineTo(5,5);
+
+ path1.connectPath(path2);
+
+ QVERIFY(path1.elementAt(0).type == QPainterPath::MoveToElement);
+ QVERIFY(path2.elementAt(0).type == QPainterPath::MoveToElement);
+ QVERIFY(path3.elementAt(0).type == QPainterPath::MoveToElement);
+ QVERIFY(path4.elementAt(0).type == QPainterPath::MoveToElement);
+}
+
void tst_QPainterPath::translate()
{
QPainterPath path;