diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-11 09:13:21 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-11 09:13:21 +0100 |
| commit | 8dd22d9255287bad17823d8738ac05dbffca33ab (patch) | |
| tree | 94cc700070d567960260171e7edfad9d587d1b6e /src/testlib | |
| parent | 7a342372bb1ecbe4146811cff48ede974c7761b5 (diff) | |
| parent | 9b800b55c1c4f2b3e6ed365736e357eb31423c95 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ia443f6eb1c854c99c68127a376b78c1986675a9d
Diffstat (limited to 'src/testlib')
| -rw-r--r-- | src/testlib/qtestcase.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index 8cd685f7ef..497470464f 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -1667,15 +1667,8 @@ static LONG WINAPI windowsFaultHandler(struct _EXCEPTION_POINTERS *exInfo) } #endif // Q_OS_WIN) && !Q_OS_WINRT -static void qputenvIfEmpty(const char *name, const QByteArray &value) -{ - if (qEnvironmentVariableIsEmpty(name)) - qputenv(name, value); -} - static void initEnvironment() { - qputenvIfEmpty("QT_LOGGING_TO_CONSOLE", "1"); qputenv("QT_QTESTLIB_RUNNING", "1"); } |