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

Qt4ProjectManager: Warn of a existing build for a diffrent project

Browse Source 
Task-Nr: QTCREATORBUG-2113

Reviewed-By: hunger
This commit is contained in:
dt
2010-10-07 12:08:46 +02:00
parent fe8f2c2b1a
commit 224ca48e84
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
View File

@@ -295,6 +295,7 @@ void Qt4ProjectConfigWidget::updateImportLabel()
{ {
bool visible = false; bool visible = false;
bool targetMatches = false; bool targetMatches = false;
bool incompatibleBuild = false;
QtVersionManager *vm = QtVersionManager::instance(); QtVersionManager *vm = QtVersionManager::instance();
// we only show if we actually have a qmake and makestep // we only show if we actually have a qmake and makestep
@@ -309,8 +310,11 @@ void Qt4ProjectConfigWidget::updateImportLabel()
QtVersion *version = m_buildConfiguration->qtVersion(); QtVersion *version = m_buildConfiguration->qtVersion();
// check that there's a makefile // check that there's a makefile
if (!qmakePath.isEmpty()) { if (!qmakePath.isEmpty()) {
// and that the qmake path is different from the current version // Is it from the same build?
if (qmakePath != (version ? version->qmakeCommand() : QString())) { if (!QtVersionManager::makefileIsFor(makefile, m_buildConfiguration->target()->project()->file()->fileName())) {
incompatibleBuild = true;
} else if (qmakePath != (version ? version->qmakeCommand() : QString())) {
// and that the qmake path is different from the current version
// import enable // import enable
visible = true; visible = true;
QtVersion *newVersion = vm->qtVersionForQMakeBinary(qmakePath); QtVersion *newVersion = vm->qtVersionForQMakeBinary(qmakePath);
@@ -327,8 +331,6 @@ void Qt4ProjectConfigWidget::updateImportLabel()
visible = !m_buildConfiguration->compareToImportFrom(makefile); visible = !m_buildConfiguration->compareToImportFrom(makefile);
targetMatches = true; targetMatches = true;
} }
} else {
visible = false;
} }
} }
@@ -338,7 +340,14 @@ void Qt4ProjectConfigWidget::updateImportLabel()
QList<ProjectExplorer::Task> issues = m_buildConfiguration->qtVersion()->reportIssues(m_buildConfiguration->target()->project()->file()->fileName(), QList<ProjectExplorer::Task> issues = m_buildConfiguration->qtVersion()->reportIssues(m_buildConfiguration->target()->project()->file()->fileName(),
buildDirectory); buildDirectory);
if (!issues.isEmpty()) { if (incompatibleBuild) {
m_ui->problemLabel->setVisible(true);
m_ui->warningLabel->setVisible(true);
m_ui->importLabel->setVisible(false);
m_ui->problemLabel->setText(tr("An build for a different project exists in %1, which will be overwritten.",
"%1 build directory").
arg(m_ui->shadowBuildDirEdit->path()));
} else if (!issues.isEmpty()) {
m_ui->problemLabel->setVisible(true); m_ui->problemLabel->setVisible(true);
m_ui->warningLabel->setVisible(true); m_ui->warningLabel->setVisible(true);
m_ui->importLabel->setVisible(visible); m_ui->importLabel->setVisible(visible);