Commit 0d949c69 authored by dt's avatar dt
Browse files

Case insesitive for specs comparision for windows

parent 5271117e
......@@ -1186,6 +1186,11 @@ bool Qt4Project::compareBuildConfigurationToImportFrom(const QString &buildConfi
qDebug()<<"after:"<<actualArgs;
QStringList parsedArgs = removeSpecFromArgumentList(result.second);
#ifdef Q_OS_WIN
actualSpec = actualSpec.toLower();
parsedSpec = parsedSpec.toLower();
#endif
qDebug()<<"Actual args:"<<actualArgs;
qDebug()<<"Parsed args:"<<parsedArgs;
qDebug()<<"Actual spec:"<<actualSpec;
......
......@@ -199,13 +199,21 @@ void Qt4ProjectConfigWidget::shadowBuildCheckBoxClicked(bool checked)
void Qt4ProjectConfigWidget::updateImportLabel()
{
m_ui->importLabel->setVisible(false);
if (m_ui->shadowBuildCheckBox->isChecked()) {
QString qtPath = QtVersionManager::findQtVersionFromMakefile(m_ui->shadowBuildDirEdit->path());
if (!qtPath.isEmpty()) {
m_ui->importLabel->setVisible(true);
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;
} else {
visible = !m_pro->compareBuildConfigurationToImportFrom(m_buildConfiguration, m_pro->buildDirectory(m_buildConfiguration));
}
} else {
visible = false;
}
m_ui->importLabel->setVisible(visible);
}
void Qt4ProjectConfigWidget::shadowBuildLineEditTextChanged()
......@@ -219,15 +227,6 @@ void Qt4ProjectConfigWidget::shadowBuildLineEditTextChanged()
updateImportLabel();
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()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment