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

Change-Id: I8b5a10d897a926078895ae41f48cdbd2474902b8

2 files changed, 2 insertions, 3 deletions

diff --git a/tests/auto/testlib/selftests/generate_expected_output.py b/tests/auto/testlib/selftests/generate_expected_output.py
index a959a71749..c059b83511 100755
--- a/tests/auto/testlib/selftests/generate_expected_output.py
+++ b/tests/auto/testlib/selftests/generate_expected_output.py
@@ -257,7 +257,7 @@ def main(name, *args):
         # Avoid interference from any qtlogging.ini files, e.g. in
         # /etc/xdg/QtProject/, (must match tst_selftests.cpp's
         # processEnvironment()'s value):
-        QT_LOGGING_RULES = '*.debug=true;qt.qpa.screen=false')
+        QT_LOGGING_RULES = '*.debug=true;qt.*=false')
 
     herePath = os.getcwd()
     cleaner = Cleaner(herePath, name)
diff --git a/tests/auto/testlib/selftests/tst_selftests.cpp b/tests/auto/testlib/selftests/tst_selftests.cpp
index 8ac2ca7b90..1da1787c1d 100644
--- a/tests/auto/testlib/selftests/tst_selftests.cpp
+++ b/tests/auto/testlib/selftests/tst_selftests.cpp
@@ -417,7 +417,6 @@ tst_Selftests::tst_Selftests()
 void tst_Selftests::initTestCase()
 {
     QVERIFY2(tempDir.isValid(), qPrintable(tempDir.errorString()));
-    qputenv("QT_LOGGING_RULES", QByteArrayLiteral("*.debug=false")); // Silence any debug output
     //Detect the location of the sub programs
     QString subProgram = QLatin1String("float/float");
 #if defined(Q_OS_WIN)
@@ -657,7 +656,7 @@ static QProcessEnvironment processEnvironment()
         // Avoid interference from any qtlogging.ini files, e.g. in /etc/xdg/QtProject/:
         result.insert(QStringLiteral("QT_LOGGING_RULES"),
                       // Must match generate_expected_output.py's main()'s value:
-                      QStringLiteral("*.debug=true;qt.qpa.screen=false"));
+                      QStringLiteral("*.debug=true;qt.*=false"));
     }
     return result;
 }