Merge commit 'qt/master'

Conflicts:
	examples/painting/svgviewer/files/bubbles.svg
	src/corelib/kernel/qobject.cpp
	src/network/kernel/qhostinfo.cpp
	tests/auto/qhostinfo/tst_qhostinfo.cpp

1 files changed, 9 insertions, 0 deletions

diff --git a/tests/auto/qquaternion/tst_qquaternion.cpp b/tests/auto/qquaternion/tst_qquaternion.cpp
index ba546f1..1fb2d6b 100644
--- a/tests/auto/qquaternion/tst_qquaternion.cpp
+++ b/tests/auto/qquaternion/tst_qquaternion.cpp
@@ -466,6 +466,15 @@ void tst_QQuaternion::multiply_data()
     QTest::newRow("complex")
         << (qreal)1.0f << (qreal)2.0f << (qreal)3.0f << (qreal)7.0f
         << (qreal)4.0f << (qreal)5.0f << (qreal)6.0f << (qreal)8.0f;
+
+    for (qreal w = -1.0f; w <= 1.0f; w += 0.5f)
+        for (qreal x = -1.0f; x <= 1.0f; x += 0.5f)
+            for (qreal y = -1.0f; y <= 1.0f; y += 0.5f)
+                for (qreal z = -1.0f; z <= 1.0f; z += 0.5f) {
+                    QTest::newRow("exhaustive")
+                        << x << y << z << w
+                        << z << w << y << x;
+                }
 }
 void tst_QQuaternion::multiply()
 {