feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/6.0'

Browse Source 
Conflicts:
	src/libs/utils/theme/theme_mac.mm
	src/plugins/android/androiddeployqtstep.cpp
	src/plugins/debugger/lldb/lldbengine.cpp

Change-Id: I5f2c62e0bce6c91a53a554b3278dbe23ff7dde36
This commit is contained in:
Eike Ziller
2021-11-11 11:54:41 +01:00
parent aac740f127 c97a144034
commit 164aae53d2
129 changed files with 4084 additions and 328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/autotest/gtest/gtestconfiguration.cpp
View File

@@ -55,6 +55,7 @@ QStringList filterInterfering(const QStringList &provided, QStringList *omitted)
"--gtest_stream_result_to=",
"--gtest_break_on_failure",
"--gtest_throw_on_failure",
"--gtest_catch_exceptions=",
"--gtest_print_time="
};
@@ -100,6 +101,7 @@ QStringList GTestConfiguration::argumentsForTestRunner(QStringList *omitted) con
if (isDebugRunMode()) {
if (gSettings->breakOnFailure.value())
arguments << "--gtest_break_on_failure";
arguments << "--gtest_catch_exceptions=0";
}
return arguments;
}