Merge "Merge remote-tracking branch 'origin/master' into api_changes" into refs/staging/api_changes

1 files changed, 5 insertions, 5 deletions

diff --git a/tests/auto/testlib/selftests/expected_strcmp.xunitxml b/tests/auto/testlib/selftests/expected_strcmp.xunitxml
index c2b694b8bb..a900e2f17a 100644
--- a/tests/auto/testlib/selftests/expected_strcmp.xunitxml
+++ b/tests/auto/testlib/selftests/expected_strcmp.xunitxml
@@ -11,27 +11,27 @@
     <!-- message="Next test should fail" type="info" -->
     <!-- message="Next test should fail" type="info" -->
     <failure message="Compared values are not the same
-   Actual (a): 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 ...
+   Actual   (a): 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 ...
    Expected (b): 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 ..." result="fail"/>
   </testcase>
   <testcase result="fail" name="failByteArray">
     <failure message="Compared values are not the same
-   Actual (QByteArray(&quot;abc&quot;)): 61 62 63
+   Actual   (QByteArray(&quot;abc&quot;)): 61 62 63
    Expected (QByteArray(&quot;cba&quot;)): 63 62 61" result="fail"/>
   </testcase>
   <testcase result="fail" name="failByteArrayNull">
     <failure message="Compared values are not the same
-   Actual (QByteArray(&quot;foo&quot;)): 66 6F 6F
+   Actual   (QByteArray(&quot;foo&quot;)): 66 6F 6F
    Expected (QByteArray()): " result="fail"/>
   </testcase>
   <testcase result="fail" name="failByteArrayEmpty">
     <failure message="Compared values are not the same
-   Actual (QByteArray(&quot;&quot;)): 
+   Actual   (QByteArray(&quot;&quot;)): 
    Expected (QByteArray(&quot;foo&quot;)): 66 6F 6F" result="fail"/>
   </testcase>
   <testcase result="fail" name="failByteArraySingleChars">
     <failure message="Compared values are not the same
-   Actual (QByteArray(&quot;6&quot;)): 36
+   Actual   (QByteArray(&quot;6&quot;)): 36
    Expected (QByteArray(&quot;7&quot;)): 37" result="fail"/>
   </testcase>
   <testcase result="pass" name="cleanupTestCase"/>