feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Qt4ProjectManager: Small refactoring in reportIssues

Browse Source 
Do not report project dir specific issues next to each
buildconfiguration. Also move the code to a place the TargetSetupPage
can easily use, without having a hardcoded target list. Note: They
currently aren't shown at all, next step is to show them once per
target.

Reviewed-By: hunger
This commit is contained in:
dt
2011-03-11 15:58:33 +01:00
parent ffc8be6c88
commit 8a180f71df
12 changed files with 83 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/qt4projectmanager/qt4target.cpp
View File

@@ -116,6 +116,11 @@ QString Qt4BaseTargetFactory::msgBuildConfigurationName(const BuildConfiguration
tr("%1 Release").arg(qtVersionName);
}
QList<ProjectExplorer::Task> Qt4BaseTargetFactory::reportIssues(const QString &proFile)
{
return QList<ProjectExplorer::Task>();
}
// -------------------------------------------------------------------------
// Qt4BaseTarget
// -------------------------------------------------------------------------
@@ -536,6 +541,7 @@ void Qt4DefaultTargetSetupWidget::setBuildConfigurationInfos(const QList<BuildCo
clearWidgets();
setupWidgets();
} else {
bool foundIssues = false;
m_ignoreChange = true;
QString sourceDir = QFileInfo(m_proFilePath).absolutePath();
for (int i=0; i < m_checkboxes.size(); ++i) {
@@ -546,9 +552,11 @@ void Qt4DefaultTargetSetupWidget::setBuildConfigurationInfos(const QList<BuildCo
m_pathChoosers[i]->setPath(info.directory);
else
m_pathChoosers[i]->setPath(sourceDir);
reportIssues(i);
foundIssues &= reportIssues(i);
}
m_ignoreChange = false;
if (foundIssues)
m_detailsWidget->setState(Utils::DetailsWidget::Expanded);
}
}
@@ -575,6 +583,7 @@ void Qt4DefaultTargetSetupWidget::setupWidgets()
{
m_ignoreChange = true;
QString sourceDir = QFileInfo(m_proFilePath).absolutePath();
bool foundIssues = false;
for (int i = 0; i < m_infos.size(); ++i) {
const BuildConfigurationInfo &info = m_infos.at(i);
QCheckBox *checkbox = new QCheckBox;
@@ -604,8 +613,10 @@ void Qt4DefaultTargetSetupWidget::setupWidgets()
m_checkboxes.append(checkbox);
m_pathChoosers.append(pathChooser);
m_reportIssuesLabels.append(reportIssuesLabel);
reportIssues(i);
foundIssues = reportIssues(i);
}
if (foundIssues)
m_detailsWidget->setState(Utils::DetailsWidget::Expanded);
m_ignoreChange = false;
}
@@ -685,12 +696,13 @@ void Qt4DefaultTargetSetupWidget::shadowBuildingToggled()
m_ignoreChange = false;
}
void Qt4DefaultTargetSetupWidget::reportIssues(int index)
bool Qt4DefaultTargetSetupWidget::reportIssues(int index)
{
QPair<ProjectExplorer::Task::TaskType, QString> issues = findIssues(m_infos.at(index));
QLabel *reportIssuesLabel = m_reportIssuesLabels.at(index);
reportIssuesLabel->setText(issues.second);
reportIssuesLabel->setVisible(issues.first != ProjectExplorer::Task::Unknown);
return issues.first != ProjectExplorer::Task::Unknown;
}
QPair<ProjectExplorer::Task::TaskType, QString> Qt4DefaultTargetSetupWidget::findIssues(const BuildConfigurationInfo &info)
@@ -701,7 +713,7 @@ QPair<ProjectExplorer::Task::TaskType, QString> Qt4DefaultTargetSetupWidget::fin
QString buildDir = info.directory;
QtVersion *version = info.version;
QList<ProjectExplorer::Task> issues = version->reportIssues(m_proFilePath, buildDir);
QList<ProjectExplorer::Task> issues = version->reportIssues(m_proFilePath, buildDir, false);
QString text;
ProjectExplorer::Task::TaskType highestType = ProjectExplorer::Task::Unknown;