Merge remote-tracking branch 'origin/2.4'

Conflicts:
	qtcreator.pri
	share/qtcreator/templates/qtquickapp/main.cpp
	src/plugins/analyzerbase/analyzermanager.cpp
	src/plugins/qmlprofiler/qmlprofilertool.cpp

Change-Id: I3be78f22e7301d61a9c7fc142cbc34a3cebc2cf4

src/plugins/analyzerbase/analyzerruncontrol.cpp

@@ -94,7 +94,6 @@ AnalyzerRunControl::AnalyzerRunControl(IAnalyzerTool *tool,
             SLOT(addTask(ProjectExplorer::Task::TaskType,QString,QString,int)));
     connect(d->m_engine, SIGNAL(finished()),
             SLOT(engineFinished()));
-    connect(this, SIGNAL(finished()), SLOT(runControlFinished()), Qt::QueuedConnection);
 }
 
 AnalyzerRunControl::~AnalyzerRunControl()
@@ -114,6 +113,8 @@ void AnalyzerRunControl::start()
         return;
     }
 
+    AnalyzerManager::handleToolStarted();
+
     // clear about-to-be-outdated tasks
     ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
     TaskHub *hub = pm->getObject<TaskHub>();
@@ -145,12 +146,8 @@ void AnalyzerRunControl::stopIt()
 void AnalyzerRunControl::engineFinished()
 {
     d->m_isRunning = false;
-    emit finished();
-}
-
-void AnalyzerRunControl::runControlFinished()
-{
     AnalyzerManager::handleToolFinished();
+    emit finished();
 }
 
 bool AnalyzerRunControl::isRunning() const