Merge master -> api_changes

Includes fixes for tst_qfiledialog2, tst_qtextedit autotests on mac.

Change-Id: I49cac26894d31291a8339ccc1eb80b6a940f0827

1 files changed, 8 insertions, 1 deletions

diff --git a/tests/auto/testlib/selftests/tst_selftests.cpp b/tests/auto/testlib/selftests/tst_selftests.cpp
index decaa55386..2b90bdb389 100644
--- a/tests/auto/testlib/selftests/tst_selftests.cpp
+++ b/tests/auto/testlib/selftests/tst_selftests.cpp
@@ -155,7 +155,7 @@ static inline QString logFormat(const QString &logger)
 // Return the log file name, or an empty string if the log goes to stdout.
 static inline QString logName(const QString &logger)
 {
-    return (logger.startsWith("stdout") ? "" : "test_output." + logger);
+    return (logger.startsWith("stdout") ? "" : QString("test_output." + logger));
 }
 
 // Load the expected test output for the nominated test (subdir) and logger
@@ -354,6 +354,7 @@ void tst_Selftests::runSubTest_data()
         << "printdatatags"
         << "printdatatagswithglobaltags"
         << "qexecstringlist"
+        << "silent"
         << "singleskip"
         << "skip"
         << "skipcleanup"
@@ -409,6 +410,9 @@ void tst_Selftests::runSubTest_data()
             else if (subtest == "printdatatagswithglobaltags") {
                 arguments << "-datatags";
             }
+            else if (subtest == "silent") {
+                arguments << "-silent";
+            }
 
 
             // These tests don't work right unless logging plain text to
@@ -434,6 +438,9 @@ void tst_Selftests::runSubTest_data()
                 if (subtest == "printdatatagswithglobaltags") {
                     continue;
                 }
+                if (subtest == "silent") {
+                    continue;
+                }
                 // `crashes' will not output valid XML on platforms without a crash handler
                 if (subtest == "crashes") {
                     continue;