diff options
| author | dt <qtc-committer@nokia.com> | 2010-06-10 18:04:31 +0200 |
|---|---|---|
| committer | dt <qtc-committer@nokia.com> | 2010-06-10 18:06:01 +0200 |
| commit | 20764c225b5cd623e4541c0bd9ccbd5f14fb6006 (patch) | |
| tree | 03f91b73377e1c4fcccbe71769247b33ee47bd15 /src/plugins/projectexplorer/buildmanager.cpp | |
| parent | 9d7a054c6bcc8599001027e6706b2d19ee77ee12 (diff) | |
| download | qt-creator-20764c225b5cd623e4541c0bd9ccbd5f14fb6006.tar.gz | |
Fix double output in compile output window
Diffstat (limited to 'src/plugins/projectexplorer/buildmanager.cpp')
| -rw-r--r-- | src/plugins/projectexplorer/buildmanager.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/projectexplorer/buildmanager.cpp b/src/plugins/projectexplorer/buildmanager.cpp index d8b7f539f6..272e38e0be 100644 --- a/src/plugins/projectexplorer/buildmanager.cpp +++ b/src/plugins/projectexplorer/buildmanager.cpp @@ -151,8 +151,8 @@ void BuildManager::cancel() disconnect(m_currentBuildStep, SIGNAL(addTask(ProjectExplorer::Task)), this, SLOT(addToTaskWindow(ProjectExplorer::Task))); - disconnect(m_currentBuildStep, SIGNAL(addOutput(QString)), - this, SLOT(addToOutputWindow(QString))); + disconnect(m_currentBuildStep, SIGNAL(addOutput(QString, QTextCharFormat)), + this, SLOT(addToOutputWindow(QString, QTextCharFormat))); decrementActiveBuildSteps(m_currentBuildStep->buildConfiguration()->target()->project()); m_progressFutureInterface->setProgressValueAndText(m_progress*100, "Build canceled"); //TODO NBS fix in qtconcurrent @@ -191,8 +191,8 @@ void BuildManager::clearBuildQueue() decrementActiveBuildSteps(bs->buildConfiguration()->target()->project()); disconnect(bs, SIGNAL(addTask(ProjectExplorer::Task)), this, SLOT(addToTaskWindow(ProjectExplorer::Task))); - disconnect(bs, SIGNAL(addOutput(QString)), - this, SLOT(addToOutputWindow(QString))); + disconnect(bs, SIGNAL(addOutput(QString, QTextCharFormat)), + this, SLOT(addToOutputWindow(QString, QTextCharFormat))); } m_buildQueue.clear(); |