Merge remote-tracking branch 'origin/2.8'

Conflicts: src/plugins/cpptools/cppmodelmanager.cpp Change-Id: I0e69dfad951eb81d8008f5ca05e8fb6999ae2c8a
2013-07-25 13:18:31 +02:00
parent e2ce17ef00 1dd9a54ab6
commit 6896546ba5
66 changed files with 836 additions and 384 deletions
--- a/src/libs/extensionsystem/pluginmanager.cpp
+++ b/src/libs/extensionsystem/pluginmanager.cpp
@@ -818,6 +818,10 @@ void PluginManagerPrivate::nextDelayedInitialize()
        delayedInitializeTimer = 0;
        profilingSummary();
        emit q->initializationDone();
+#ifdef WITH_TESTS
+        if (q->testRunRequested())
+            q->startTests();
+#endif
    } else {
        delayedInitializeTimer->start();
    }