From 0d949c69bf552a79d1c9a98f0f3b940992468819 Mon Sep 17 00:00:00 2001
From: dt <qtc-committer@nokia.com>
Date: Fri, 24 Jul 2009 16:27:29 +0200
Subject: [PATCH] Case insesitive for specs comparision for windows
---
src/plugins/qt4projectmanager/qt4project.cpp | 5 ++++
.../qt4projectconfigwidget.cpp | 27 +++++++++----------
2 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp
index c242402ff04..338621b248c 100644
--- a/src/plugins/qt4projectmanager/qt4project.cpp
+++ b/src/plugins/qt4projectmanager/qt4project.cpp
@@ -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;
diff --git a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
index eb30988655c..25658b5a9cd 100644
--- a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
+++ b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
@@ -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()
--
GitLab