From aa9329e7383f0e86a01223872b341972a3b290d7 Mon Sep 17 00:00:00 2001
From: dt <qtc-committer@nokia.com>
Date: Tue, 10 Nov 2009 18:57:40 +0100
Subject: [PATCH] More fixes for windows
---
src/plugins/qt4projectmanager/qt4project.cpp | 15 ++++++++++++---
.../qt4projectmanager/qtversionmanager.cpp | 6 +++++-
2 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp
index 2ab7642014d..57ea25070d1 100644
--- a/src/plugins/qt4projectmanager/qt4project.cpp
+++ b/src/plugins/qt4projectmanager/qt4project.cpp
@@ -1014,11 +1014,15 @@ QString Qt4Project::extractSpecFromArgumentList(const QStringList &list, QString
if (index >= list.length())
return QString();
- QString baseMkspecDir = version->versionInfo().value("QMAKE_MKSPECS");
+ QString baseMkspecDir = version->versionInfo().value("QMAKE_MKSPECS");
if (baseMkspecDir.isEmpty())
baseMkspecDir = version->versionInfo().value("QT_INSTALL_DATA") + "/mkspecs";
QString parsedSpec = QDir::cleanPath(list.at(index));
+#ifdef Q_OS_WIN
+ baseMkspecDir = baseMkspecDir.toLower();
+ parsedSpec = parsedSpec.toLower();
+#endif
// if the path is relative it can be
// relative to the working directory (as found in the Makefiles)
// or relatively to the mkspec directory
@@ -1027,6 +1031,9 @@ QString Qt4Project::extractSpecFromArgumentList(const QStringList &list, QString
if (QFileInfo(parsedSpec).isRelative()) {
if(QFileInfo(directory + "/" + parsedSpec).exists()) {
parsedSpec = QDir::cleanPath(directory + "/" + parsedSpec);
+#ifdef Q_OS_WIN
+ parsedSpec = parsedSpec.toLower();
+#endif
} else {
parsedSpec = baseMkspecDir + "/" + parsedSpec;
}
@@ -1043,7 +1050,7 @@ QString Qt4Project::extractSpecFromArgumentList(const QStringList &list, QString
} else {
QString sourceMkSpecPath = version->sourcePath() + "/mkspecs";
if (parsedSpec.startsWith(sourceMkSpecPath)) {
- parsedSpec = sourceMkSpecPath.mid(sourceMkSpecPath.length() + 1);
+ parsedSpec = parsedSpec.mid(sourceMkSpecPath.length() + 1);
}
}
#ifdef Q_OS_WIN
@@ -1309,7 +1316,9 @@ bool Qt4Project::compareBuildConfigurationToImportFrom(BuildConfiguration *confi
if (actualSpec == parsedSpec)
return true;
// Actual spec is the default one
- if (actualSpec == version->mkspec() && (parsedSpec == "default" || parsedSpec.isEmpty()))
+ qDebug()<<"AS vs VS"<<actualSpec<<version->mkspec();
+ if ((actualSpec == version->mkspec() || actualSpec == "default")
+ && (parsedSpec == version->mkspec() || parsedSpec == "default" || parsedSpec.isEmpty()))
return true;
}
}
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp
index d3090e481f1..ee8607c155e 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.cpp
+++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp
@@ -1069,6 +1069,10 @@ void QtVersion::updateToolChainAndMkspec() const
if (baseMkspecDir.isEmpty())
baseMkspecDir = versionInfo().value("QT_INSTALL_DATA") + "/mkspecs";
+#ifdef Q_OS_WIN
+ baseMkspecDir = baseMkspecDir.toLower();
+#endif
+
QString mkspecFullPath = baseMkspecDir + "/default";
// qDebug() << "default mkspec is located at" << mkspecFullPath;
@@ -1123,7 +1127,7 @@ void QtVersion::updateToolChainAndMkspec() const
#endif
#ifdef Q_OS_WIN
- m_mkspecFullPath = m_mkspecFullPath.toLower();
+ mkspecFullPath = mkspecFullPath.toLower();
#endif
m_mkspecFullPath = mkspecFullPath;
--
GitLab