3 files changed, 73 insertions, 8 deletions

diff --git a/tests/auto/gui/math3d/qquaternion/tst_qquaternion.cpp b/tests/auto/gui/math3d/qquaternion/tst_qquaternion.cpp
index 8041fb5439..7dbd587451 100644
--- a/tests/auto/gui/math3d/qquaternion/tst_qquaternion.cpp
+++ b/tests/auto/gui/math3d/qquaternion/tst_qquaternion.cpp
@@ -1088,35 +1088,38 @@ void tst_QQuaternion::fromEulerAngles_data()
     QTest::addColumn<float>("yaw");
     QTest::addColumn<float>("roll");
 
+    QTest::addColumn<QQuaternion>("quaternion");
+
     QTest::newRow("null")
-        << 0.0f << 0.0f << 0.0f;
+        << 0.0f << 0.0f << 0.0f << QQuaternion(1.0f, 0.0f, 0.0f, 0.0f);
 
     QTest::newRow("xonly")
-        << 90.0f << 0.0f << 0.0f;
+        << 90.0f << 0.0f << 0.0f << QQuaternion(0.707107f, 0.707107f, 0.0f, 0.0f);
 
     QTest::newRow("yonly")
-        << 0.0f << 180.0f << 0.0f;
+        << 0.0f << 180.0f << 0.0f << QQuaternion(0.0f, 0.0f, 1.0f, 0.0f);
 
     QTest::newRow("zonly")
-        << 0.0f << 0.0f << 270.0f;
+        << 0.0f << 0.0f << 270.0f << QQuaternion(-0.707107f, 0.0f, 0.0f, 0.707107f);
 
     QTest::newRow("x+z")
-        << 30.0f << 0.0f << 45.0f;
+        << 30.0f << 0.0f << 45.0f << QQuaternion(0.892399f, 0.239118f, -0.099046f, 0.369644f);
 
     QTest::newRow("x+y")
-        << 30.0f << 90.0f << 0.0f;
+        << 30.0f << 90.0f << 0.0f << QQuaternion(0.683013f, 0.183013f, 0.683013f, -0.183013f);
 
     QTest::newRow("y+z")
-        << 0.0f << 45.0f << 30.0f;
+        << 0.0f << 45.0f << 30.0f << QQuaternion(0.892399f, 0.099046f, 0.369644f, 0.239118f);
 
     QTest::newRow("complex")
-        << 30.0f << 240.0f << -45.0f;
+        << 30.0f << 240.0f << -45.0f << QQuaternion(-0.531976f, -0.43968f, 0.723317f, -0.02226f);
 }
 void tst_QQuaternion::fromEulerAngles()
 {
     QFETCH(float, pitch);
     QFETCH(float, yaw);
     QFETCH(float, roll);
+    QFETCH(QQuaternion, quaternion);
 
     // Use a straight-forward implementation of the algorithm at:
     // http://www.j3d.org/matrix_faq/matrfaq_latest.html#Q60
@@ -1132,11 +1135,22 @@ void tst_QQuaternion::fromEulerAngles()
     QVERIFY(myFuzzyCompare(answer.z(), result.z()));
     QVERIFY(myFuzzyCompare(answer.scalar(), result.scalar()));
 
+    // quaternion should be the same as the result
+    QVERIFY(myFuzzyCompare(answer.x(), quaternion.x()));
+    QVERIFY(myFuzzyCompare(answer.y(), quaternion.y()));
+    QVERIFY(myFuzzyCompare(answer.z(), quaternion.z()));
+    QVERIFY(myFuzzyCompare(answer.scalar(), quaternion.scalar()));
+
     {
         QVector3D answerEulerAngles = answer.toEulerAngles();
         QVERIFY(myFuzzyCompareDegrees(answerEulerAngles.x(), pitch));
         QVERIFY(myFuzzyCompareDegrees(answerEulerAngles.y(), yaw));
         QVERIFY(myFuzzyCompareDegrees(answerEulerAngles.z(), roll));
+
+        QVector3D quaternionEulerAngles = quaternion.toEulerAngles();
+        QVERIFY(myFuzzyCompareDegrees(quaternionEulerAngles.x(), pitch));
+        QVERIFY(myFuzzyCompareDegrees(quaternionEulerAngles.y(), yaw));
+        QVERIFY(myFuzzyCompareDegrees(quaternionEulerAngles.z(), roll));
     }
 
     answer = QQuaternion::fromEulerAngles(pitch, yaw, roll);
@@ -1151,6 +1165,12 @@ void tst_QQuaternion::fromEulerAngles()
         QVERIFY(myFuzzyCompareDegrees(answerPitch, pitch));
         QVERIFY(myFuzzyCompareDegrees(answerYaw, yaw));
         QVERIFY(myFuzzyCompareDegrees(answerRoll, roll));
+
+        float quaternionPitch, quaternionYaw, quaternionRoll;
+        quaternion.getEulerAngles(&quaternionPitch, &quaternionYaw, &quaternionRoll);
+        QVERIFY(myFuzzyCompareDegrees(quaternionPitch, pitch));
+        QVERIFY(myFuzzyCompareDegrees(quaternionYaw, yaw));
+        QVERIFY(myFuzzyCompareDegrees(quaternionRoll, roll));
     }
 }
 
diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
index 42e98ce363..d7c3f95f1d 100644
--- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
+++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
@@ -308,6 +308,7 @@ private slots:
     void fillPolygon();
 
     void drawImageAtPointF();
+    void scaledDashes();
 
 private:
     void fillData();
@@ -5468,6 +5469,36 @@ void tst_QPainter::drawImageAtPointF()
     paint.end();
 }
 
+void tst_QPainter::scaledDashes()
+{
+    // Test that we do not hit the limit-huge-number-of-dashes path
+    QRgb fore = qRgb(0, 0, 0xff);
+    QRgb back = qRgb(0xff, 0xff, 0);
+    QImage image(5, 32, QImage::Format_RGB32);
+    image.fill(back);
+    QPainter p(&image);
+    QPen pen(QColor(fore), 3, Qt::DotLine);
+    p.setPen(pen);
+    p.scale(1, 2);
+    p.drawLine(2, 0, 2, 16);
+    p.end();
+
+    bool foreFound = false;
+    bool backFound = false;
+    int i = 0;
+    while (i < 32 && (!foreFound || !backFound)) {
+        QRgb pix = image.pixel(3, i);
+        if (pix == fore)
+            foreFound = true;
+        else if (pix == back)
+            backFound = true;
+        i++;
+    }
+
+    QVERIFY(foreFound);
+    QVERIFY(backFound);
+}
+
 QTEST_MAIN(tst_QPainter)
 
 #include "tst_qpainter.moc"
diff --git a/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp b/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp
index c1dd2d97a1..2feca77f40 100644
--- a/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp
+++ b/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp
@@ -1909,6 +1909,20 @@ void tst_QTextLayout::longText()
         QFontMetricsF fm(layout.font());
         QVERIFY(layout.maximumWidth() - fm.horizontalAdvance(' ') <= QFIXED_MAX);
     }
+
+    {
+        QTextLayout layout(QString("AAAAAAAA").repeated(200000));
+        layout.setCacheEnabled(true);
+        layout.beginLayout();
+        forever {
+            QTextLine line = layout.createLine();
+            if (!line.isValid())
+                break;
+        }
+        layout.endLayout();
+        QFontMetricsF fm(layout.font());
+        QVERIFY(layout.maximumWidth() - fm.horizontalAdvance('A') <= QFIXED_MAX);
+    }
 }
 
 void tst_QTextLayout::widthOfTabs()