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
2011-11-18 10:16:49 +01:00
parent 826354e3da a8a170a4d4
commit fbd47e25ee
93 changed files with 4807 additions and 1775 deletions
--- a/src/plugins/qmlprofiler/qmlprofilerengine.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerengine.cpp
@@ -206,7 +206,6 @@ bool QmlProfilerEngine::start()
        d->m_fetchingData = true;
    }

-    AnalyzerManager::handleToolStarted();
    emit starting(this);
    return true;
 }