Merge remote-tracking branch 'origin/2.8'

Conflicts:
	src/plugins/cpptools/cppmodelmanager.cpp

Change-Id: I0e69dfad951eb81d8008f5ca05e8fb6999ae2c8a

src/app/main.cpp

@@ -517,12 +517,6 @@ int main(int argc, char **argv)
     // shutdown plugin manager on the exit
     QObject::connect(&app, SIGNAL(aboutToQuit()), &pluginManager, SLOT(shutdown()));
 
-#ifdef WITH_TESTS
-    // Do this after the event loop has started
-    if (PluginManager::testRunRequested())
-        QTimer::singleShot(100, &pluginManager, SLOT(startTests()));
-#endif
-
     const int r = app.exec();
     cleanupCrashHandler();
     return r;