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

Case insesitive for specs comparision for windows

Browse Source
This commit is contained in:
dt
2009-07-24 16:27:29 +02:00
parent 5271117e5b
commit 0d949c69bf
2 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qt4projectmanager/qt4project.cpp
View File

@@ -1186,6 +1186,11 @@ bool Qt4Project::compareBuildConfigurationToImportFrom(const QString &buildConfi
qDebug()<<"after:"<<actualArgs; qDebug()<<"after:"<<actualArgs;
QStringList parsedArgs = removeSpecFromArgumentList(result.second); QStringList parsedArgs = removeSpecFromArgumentList(result.second);
#ifdef Q_OS_WIN
actualSpec = actualSpec.toLower();
parsedSpec = parsedSpec.toLower();
#endif
qDebug()<<"Actual args:"<<actualArgs; qDebug()<<"Actual args:"<<actualArgs;
qDebug()<<"Parsed args:"<<parsedArgs; qDebug()<<"Parsed args:"<<parsedArgs;
qDebug()<<"Actual spec:"<<actualSpec; qDebug()<<"Actual spec:"<<actualSpec;

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

@@ -199,13 +199,21 @@ void Qt4ProjectConfigWidget::shadowBuildCheckBoxClicked(bool checked)
void Qt4ProjectConfigWidget::updateImportLabel() void Qt4ProjectConfigWidget::updateImportLabel()
{ {
m_ui->importLabel->setVisible(false); bool visible = false;
if (m_ui->shadowBuildCheckBox->isChecked()) {
QString qtPath = QtVersionManager::findQtVersionFromMakefile(m_ui->shadowBuildDirEdit->path()); QString qtPath = QtVersionManager::findQtVersionFromMakefile(m_pro->buildDirectory(m_buildConfiguration));
if (!qtPath.isEmpty()) { QtVersion *version = m_pro->qtVersion(m_buildConfiguration);
m_ui->importLabel->setVisible(true); if (!qtPath.isEmpty()) {
if (qtPath != (version ? version->path() : QString())) {
visible = true;
} else {
visible = !m_pro->compareBuildConfigurationToImportFrom(m_buildConfiguration, m_pro->buildDirectory(m_buildConfiguration));
} }
} else {
visible = false;
} }
m_ui->importLabel->setVisible(visible);
} }
void Qt4ProjectConfigWidget::shadowBuildLineEditTextChanged() void Qt4ProjectConfigWidget::shadowBuildLineEditTextChanged()
@@ -219,15 +227,6 @@ void Qt4ProjectConfigWidget::shadowBuildLineEditTextChanged()
updateImportLabel(); updateImportLabel();
m_pro->invalidateCachedTargetInformation(); m_pro->invalidateCachedTargetInformation();
// QFileInfo fi(m_ui->shadowBuildDirEdit->path());
// if (fi.exists()) {
// m_ui->shadowBuildLineEdit->setStyleSheet("");
// m_ui->shadowBuildLineEdit->setToolTip("");
// } else {
// m_ui->shadowBuildLineEdit->setStyleSheet("background: red;");
// m_ui->shadowBuildLineEdit->setToolTip(tr("Directory does not exist."));
// }
} }
void Qt4ProjectConfigWidget::importLabelClicked() void Qt4ProjectConfigWidget::importLabelClicked()