Merge remote-tracking branch 'origin/4.1'

Change-Id: Ia442f30f387fe9292217582260bbe79e54608810

src/libs/extensionsystem/pluginmanager.cpp

@@ -51,6 +51,7 @@
 #include <utils/qtcassert.h>
 
 #ifdef WITH_TESTS
+#include <utils/hostosinfo.h>
 #include <QTest>
 #endif
 
@@ -1025,7 +1026,8 @@ static int executeTestPlan(const TestPlan &testPlan)
                 << QLatin1String("-maxwarnings") << QLatin1String("0"); // unlimit output
         qExecArguments << functions;
         // avoid being stuck in QTBUG-24925
-        qExecArguments << "-nocrashhandler";
+        if (!Utils::HostOsInfo::isWindowsHost())
+            qExecArguments << "-nocrashhandler";
         failedTests += QTest::qExec(testObject, qExecArguments);
     }