diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-02 14:40:07 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-02 14:40:07 +0100 |
commit | 8c04a5e9640df0f1b2f533ee5fa698e2f466ad1f (patch) | |
tree | 32cf896f4a9c926dda04b3b671b29a2662c47aac /tests/auto/testlib | |
parent | 310daae53926628f80c08e4415b94b90ad525c8f (diff) | |
parent | 78e92997ed35ddc8bb6f7f6c0a4fffba026d5d8f (diff) | |
download | qtbase-8c04a5e9640df0f1b2f533ee5fa698e2f466ad1f.tar.gz |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I967eca8f34584fca3a1e5696978e70f620582a2a
Diffstat (limited to 'tests/auto/testlib')
-rw-r--r-- | tests/auto/testlib/selftests/tst_selftests.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/testlib/selftests/tst_selftests.cpp b/tests/auto/testlib/selftests/tst_selftests.cpp index a9c5d40734..35b8f226ec 100644 --- a/tests/auto/testlib/selftests/tst_selftests.cpp +++ b/tests/auto/testlib/selftests/tst_selftests.cpp @@ -400,6 +400,7 @@ 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) |