Merge remote-tracking branch 'origin/6.0'

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

Change-Id: I5f2c62e0bce6c91a53a554b3278dbe23ff7dde36

1 files changed, 2 insertions, 0 deletions

diff --git a/src/plugins/autotest/gtest/gtestconfiguration.cpp b/src/plugins/autotest/gtest/gtestconfiguration.cpp
index a4903b075a..cbdd0c8e8a 100644
--- a/src/plugins/autotest/gtest/gtestconfiguration.cpp
+++ b/src/plugins/autotest/gtest/gtestconfiguration.cpp
@@ -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;
 }