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

Some steps towards making qmakestep and makestep not mandotary.

Browse Source 
Also fix a small bug with the import label.
This commit is contained in:
dt
2009-07-27 15:02:34 +02:00
parent a4bb16c95f
commit f35a0f5429
3 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -201,16 +201,23 @@ void Qt4ProjectConfigWidget::updateImportLabel()
{
bool visible = false;
QString qtPath = QtVersionManager::findQtVersionFromMakefile(m_pro->buildDirectory(m_buildConfiguration));
QtVersion *version = m_pro->qtVersion(m_buildConfiguration);
if (!qtPath.isEmpty()) {
if (qtPath != (version ? version->path() : QString())) {
visible = true;
// we only show if we actually have a qmake and makestep
if (m_pro->qmakeStep() && m_pro->makeStep()) {
QString qtPath = QtVersionManager::findQtVersionFromMakefile(m_pro->buildDirectory(m_buildConfiguration));
QtVersion *version = m_pro->qtVersion(m_buildConfiguration);
// check that there's a makefile
if (!qtPath.isEmpty()) {
// and that the makefile path is different from the current version
if (qtPath != (version ? version->path() : QString())) {
// import enable
visible = true;
} else {
// check that the qmake flags, arguments match
visible = !m_pro->compareBuildConfigurationToImportFrom(m_buildConfiguration, m_pro->buildDirectory(m_buildConfiguration));
}
} else {
visible = !m_pro->compareBuildConfigurationToImportFrom(m_buildConfiguration, m_pro->buildDirectory(m_buildConfiguration));
visible = false;
}
} else {
visible = false;
}
m_ui->importLabel->setVisible(visible);
@@ -231,6 +238,8 @@ void Qt4ProjectConfigWidget::shadowBuildLineEditTextChanged()
void Qt4ProjectConfigWidget::importLabelClicked()
{
if (!m_pro->qmakeStep() || !m_pro->makeStep())
return;
QString directory = m_pro->buildDirectory(m_buildConfiguration);
if (!directory.isEmpty()) {
QString qtPath = QtVersionManager::findQtVersionFromMakefile(directory);