Merge remote-tracking branch 'origin/5.13' into dev

 Conflicts:
	tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp

Added tests/auto/testlib/selftests/expected_crashes_5.txt to work
round the output of the crashes test (which exercises UB, see
QTBUG-73903) being truncated on one test platform.

Change-Id: I9cd3f2639b4e50c3c4513e14629a40bdca8f8273

7 files changed, 47 insertions, 5 deletions

diff --git a/tests/auto/other/lancelot/scripts/degeneratebeziers.qps b/tests/auto/other/lancelot/scripts/degeneratebeziers.qps
index fb223d5b1f..6c069fd82f 100644
--- a/tests/auto/other/lancelot/scripts/degeneratebeziers.qps
+++ b/tests/auto/other/lancelot/scripts/degeneratebeziers.qps
@@ -7,4 +7,30 @@ path_cubicTo degenerate 3427.0918499999997948 3872.1318999999994048 4729.4590867
 scale 0.05 0.05
 translate -2500 -3000
 setPen black 800
-drawPath degenerate
\ No newline at end of file
+drawPath degenerate
+
+resetMatrix
+path_moveTo revbez 0 20
+path_cubicTo revbez 0 0 120 0 120 -20
+
+path_moveTo revbez 0 80
+path_cubicTo revbez 0 100 120 100 120 120
+
+translate 50 250
+
+setPen blue 40 solidline flatcap
+drawPath revbez
+setPen red 0
+drawPath revbez
+
+translate 200 0
+setPen blue 40 solidline squarecap
+drawPath revbez
+setPen red 0
+drawPath revbez
+
+translate 200 0
+setPen blue 40 solidline roundcap
+drawPath revbez
+setPen red 0
+drawPath revbez
diff --git a/tests/auto/other/macgui/macgui.pro b/tests/auto/other/macgui/macgui.pro
index 75e0d595cb..6ee22bdaec 100644
--- a/tests/auto/other/macgui/macgui.pro
+++ b/tests/auto/other/macgui/macgui.pro
@@ -9,3 +9,4 @@ QT = core-private widgets-private testlib
 osx: LIBS += -framework ApplicationServices
 
 requires(mac)
+requires(widgets)
diff --git a/tests/auto/other/macplist/macplist.pro b/tests/auto/other/macplist/macplist.pro
index 5820793cbc..df7143031a 100644
--- a/tests/auto/other/macplist/macplist.pro
+++ b/tests/auto/other/macplist/macplist.pro
@@ -1,3 +1,5 @@
+requires(widgets)
+
 TEMPLATE = subdirs
 
 test.depends = app
diff --git a/tests/auto/other/other.pro b/tests/auto/other/other.pro
index d70c895dec..a720860288 100644
--- a/tests/auto/other/other.pro
+++ b/tests/auto/other/other.pro
@@ -30,6 +30,8 @@ SUBDIRS=\
    gestures \
    lancelot \
    languagechange \
+   macgui \
+   macplist \
    qaccessibility \
    qfocusevent \
    qnetworkaccessmanager_and_qprogressdialog \
diff --git a/tests/auto/other/qcomplextext/bidireorderstring.h b/tests/auto/other/qcomplextext/bidireorderstring.h
index a7401d2c18..b537bf45e4 100644
--- a/tests/auto/other/qcomplextext/bidireorderstring.h
+++ b/tests/auto/other/qcomplextext/bidireorderstring.h
@@ -78,7 +78,7 @@ const LV logical_visual[] = {
     { "data42", "foo\nfoo", "foo\nfoo", QChar::DirL },
     { "data43", "\327\251\327\234\327\225\327\235\n\327\251\327\234\327\225\327\235", "\327\235\327\225\327\234\327\251\n\327\235\327\225\327\234\327\251", QChar::DirR },
     { "data44", "foo\n\327\251\327\234\327\225\327\235", "foo\n\327\235\327\225\327\234\327\251", QChar::DirL },
-    { "data45", "\327\251\327\234\327\225\327\235\nfoo", "\327\235\327\225\327\234\327\251\nfoo", QChar::DirR },
+    { "data45", "\327\251\327\234\327\225\327\235\nfoo", "foo\n\327\235\327\225\327\234\327\251", QChar::DirR },
     { "data46", "\330\250 1.23 \330\250", "\330\250 1.23 \330\250", QChar::DirR },
     { "data47", "\331\204\330\250 1.23 \331\202\330\250", "\330\250\331\202 1.23 \330\250\331\204", QChar::DirR },
     { "data48", "\330\250 1.2 \330\250", "\330\250 1.2 \330\250", QChar::DirR },
diff --git a/tests/auto/other/qcomplextext/tst_qcomplextext.cpp b/tests/auto/other/qcomplextext/tst_qcomplextext.cpp
index 0116e546a0..9ca61a69b4 100644
--- a/tests/auto/other/qcomplextext/tst_qcomplextext.cpp
+++ b/tests/auto/other/qcomplextext/tst_qcomplextext.cpp
@@ -66,8 +66,19 @@ void tst_QComplexText::bidiReorderString_data()
             << QString::fromUtf8( data->logical )
             << QString::fromUtf8( data->visual )
             << (int) data->basicDir;
+
+        QTest::newRow( QByteArray(data->name) + " (doubled)" )
+            << (QString::fromUtf8( data->logical ) + QChar(QChar::ParagraphSeparator) + QString::fromUtf8( data->logical ))
+            << (QString::fromUtf8( data->visual ) + QChar(QChar::ParagraphSeparator) + QString::fromUtf8( data->visual ))
+            << (int) data->basicDir;
         data++;
     }
+
+    QString isolateAndBoundary =  QString(QChar(0x2068 /* DirFSI */)) + QChar(0x1c /* DirB */) + QChar(0x2069 /* DirPDI */);
+    QTest::newRow( "isolateAndBoundary" )
+        << QString::fromUtf8( data->logical )
+        << QString::fromUtf8( data->visual )
+        << (int) QChar::DirL;
 }
 
 void tst_QComplexText::bidiReorderString()
@@ -426,7 +437,7 @@ ushort unicodeForDirection(const QByteArray &direction)
         { "ET", 0x24 },
         { "AN", 0x660 },
         { "CS", 0x2c },
-        { "B", QChar::ParagraphSeparator },
+        { "B", '\n' },
         { "S", 0x9 },
         { "WS", 0x20 },
         { "ON", 0x2a },
diff --git a/tests/auto/other/qprocess_and_guieventloop/write-read-write/write-read-write.pro b/tests/auto/other/qprocess_and_guieventloop/write-read-write/write-read-write.pro
index e236e05c7d..6a23e52d95 100644
--- a/tests/auto/other/qprocess_and_guieventloop/write-read-write/write-read-write.pro
+++ b/tests/auto/other/qprocess_and_guieventloop/write-read-write/write-read-write.pro
@@ -1,4 +1,4 @@
 SOURCES = main.cpp
-CONFIG -= qt app_bundle
-CONFIG += console
+CONFIG -= qt
+CONFIG += cmdline
 DESTDIR = ./